[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1120-g4368df8

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  4368df8c839612236951b4f16367ab178c91d42e (commit)
       via  022563dc7efb132293bff4ae9c5e21dcb3e1effc (commit)
      from  629e7aa91a33a5428676d8f6eeac19ea9fec14d6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 4368df8c839612236951b4f16367ab178c91d42e
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jun 8 10:05:11 2009 +0200

    Further fix for 6449
    
    Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!

commit 022563dc7efb132293bff4ae9c5e21dcb3e1effc
Author: Volker Lendecke <vl at samba.org>
Date:   Mon Jun 8 09:45:21 2009 +0200

    Fix bug 6449
    
    Thanks to TAKAHASHI Motonobu <monyo at samba.gr.jp> for reporting!

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

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


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index dd757ab..c04b079 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -822,7 +822,7 @@ static int rap_user_add(struct net_context *c, int argc, const char **argv)
 
 	userinfo.userflags = c->opt_flags;
 	userinfo.reserved1 = '\0';
-	userinfo.comment = smb_xstrdup(c->opt_comment);
+        userinfo.comment = smb_xstrdup(c->opt_comment ? c->opt_comment : "");
 	userinfo.priv = 1;
 	userinfo.home_dir = NULL;
 	userinfo.logon_script = NULL;
@@ -962,7 +962,7 @@ static int rap_group_add(struct net_context *c, int argc, const char **argv)
 	/* BB check for length 21 or smaller explicitly ? BB */
 	safe_strcpy(grinfo.group_name, argv[0], sizeof(grinfo.group_name)-1);
 	grinfo.reserved1 = '\0';
-	grinfo.comment = smb_xstrdup(c->opt_comment);
+	grinfo.comment = smb_xstrdup(c->opt_comment ? c->opt_comment : "");
 
 	ret = cli_NetGroupAdd(cli, &grinfo);
 	cli_shutdown(cli);


-- 
Samba Shared Repository