From 32ce95e9858ed87b69e97a3690e14b51132744d2 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 7 May 2009 10:09:32 +0200 Subject: [PATCH] Fix bug 6336: "net groupmap set" segfaults --- source/utils/net_groupmap.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/utils/net_groupmap.c b/source/utils/net_groupmap.c index b160d84..0a3a297 100644 --- a/source/utils/net_groupmap.c +++ b/source/utils/net_groupmap.c @@ -619,11 +619,13 @@ static int net_groupmap_set(struct net_context *c, int argc, const char **argv) /* The case (opt_domaingroup && opt_localgroup) was tested for above */ - if (strlen(c->opt_comment) > 0) + if ((c->opt_comment != NULL) && (strlen(c->opt_comment) > 0)) { fstrcpy(map.comment, c->opt_comment); + } - if (strlen(c->opt_newntname) > 0) + if ((c->opt_newntname != NULL) && (strlen(c->opt_newntname) > 0)) { fstrcpy(map.nt_name, c->opt_newntname); + } if (grp != NULL) map.gid = grp->gr_gid; -- 1.5.5