[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-5254-gf97e37d
Karolin Seeger
kseeger at samba.org
Thu May 7 13:41:51 GMT 2009
The branch, v3-3-test has been updated
via f97e37d0130752dded728a29f5b1024ca19a0733 (commit)
from 146d007e70351532431b739f1264615111044768 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit f97e37d0130752dded728a29f5b1024ca19a0733
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:
source/utils/net_groupmap.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
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;
--
Samba Shared Repository
More information about the samba-cvs
mailing list