[SCM] Samba Shared Repository - branch v3-4-test updated -
release-4-0-0alpha7-890-g33a53cb
Volker Lendecke
vlendec at samba.org
Thu May 7 08:11:11 GMT 2009
The branch, v3-4-test has been updated
via 33a53cb98a5f66d56ca1e0633297065f05d12a48 (commit)
from 6a617a9677da9df8f70cf2039245cfb5ce3d94c3 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -----------------------------------------------------------------
commit 33a53cb98a5f66d56ca1e0633297065f05d12a48
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
More information about the samba-cvs
mailing list