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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update 3.3 branch to 3.3.5

Location:

branches/samba-3.3.x/source/utils

Files:

• net_dom.c (modified) (1 diff)
• net_groupmap.c (modified) (1 diff)
• net_rap.c (modified) (2 diffs)
• smbget.c (modified) (1 diff)

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

@@ -39 +39 @@
         const char *password = NULL;
         uint32_t unjoin_flags = NETSETUP_ACCT_DELETE |
-                                NETSETUP_JOIN_DOMAIN;
+                                NETSETUP_JOIN_DOMAIN |
+                                NETSETUP_IGNORE_UNSUPPORTED_FLAGS;
         struct cli_state *cli = NULL;
         bool do_reboot = false;

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)

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

@@ -823 +823 @@
         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;
@@ -963 +963 @@
         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);

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

@@ -583 +583 @@
                 {"keep-permissions", 'P', POPT_ARG_NONE, &keep_permissions, 'P', "Keep permissions" },
                 {"blocksize", 'b', POPT_ARG_INT, &blocksize, 'b', "Change number of bytes in a block"},
-                {"rcfile", 'f', POPT_ARG_STRING, NULL, 0, "Use specified rc file"},
+                {"rcfile", 'f', POPT_ARG_STRING, NULL, 'f', "Use specified rc file"},
                 POPT_AUTOHELP
                 POPT_TABLEEND