[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1467-g974223b

[Volker Lendecke]

The branch, master has been updated
       via  974223b927119a1cd38fd58b215b14d81bfa0a8c (commit)
      from  6f7cd213dd38e770224cf131054862b76069aed8 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 974223b927119a1cd38fd58b215b14d81bfa0a8c
Author: Volker Lendecke <vl at samba.org>
Date:   Thu May 7 10:09:32 2009 +0200

    Fix bug 6336: "net groupmap set" segfaults

-----------------------------------------------------------------------

Summary of changes:
 source3/utils/net_groupmap.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index b160d84..0a3a297 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/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;


-- 
Samba Shared Repository