Changeset 274 for branches/samba-3.3.x/source/utils/net_groupmap.c

Timestamp:

Jun 17, 2009, 2:19:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

File:

• branches/samba-3.3.x/source/utils/net_groupmap.c (modified) (1 diff)

branches/samba-3.3.x/source/utils/net_groupmap.c

@@ -620 +620 @@
         /* 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)