The branch, v3-3-test has been updated
       via  aa03326fe523e9bc85e6db276f94e9d04aaf009d (commit)
       via  a956e36ceb22072cd4ea755ce9b4457896af4b14 (commit)
      from  8b8336a115b73eb99cd1f9a8d1286df713ec53c3 (commit)

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


- Log -----------------------------------------------------------------
commit aa03326fe523e9bc85e6db276f94e9d04aaf009d
Author: Volker Lendecke <[email protected]>
Date:   Mon Jun 8 10:05:11 2009 +0200

    Further fix for 6449
    
    Thanks to TAKAHASHI Motonobu <[email protected]> for reporting!

commit a956e36ceb22072cd4ea755ce9b4457896af4b14
Author: Volker Lendecke <[email protected]>
Date:   Mon Jun 8 09:45:21 2009 +0200

    Fix bug 6449
    
    Thanks to TAKAHASHI Motonobu <[email protected]> for reporting!

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

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


Changeset truncated at 500 lines:

diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c
index dd757ab..c04b079 100644
--- a/source/utils/net_rap.c
+++ b/source/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

Reply via email to