Changeset 988 for vendor/current/source3/utils/smbpasswd.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/utils/smbpasswd.c (modified) (15 diffs)

vendor/current/source3/utils/smbpasswd.c

@@ -98 +98 @@
                 switch(ch) {
                 case 'L':
-#if !defined(NSS_WRAPPER)
                         if (getuid() != 0) {
                                 fprintf(stderr, "smbpasswd -L can only be used by root.\n");
                                 exit(1);
                         }
-#endif
                         local_flags |= LOCAL_AM_ROOT;
                         break;
                 case 'c':
                         configfile = optarg;
+                        set_dyn_CONFIGFILE(optarg);
                         break;
                 case 'a':
@@ -137 +136 @@
                         local_flags |= LOCAL_SET_NO_PASSWORD;
                         local_flags &= ~LOCAL_SET_PASSWORD;
+                        SAFE_FREE(new_passwd);
                         new_passwd = smb_xstrdup("NO PASSWORD");
                         break;
@@ -153 +153 @@
                         break;
                 case 'R':
-                        lp_set_name_resolve_order(optarg);
+                        lp_set_cmdline("name resolve order", optarg);
                         break;
                 case 'D':
@@ -196 +196 @@
         }
 
-        if (!lp_load(configfile,True,False,False,True)) {
+        if (!lp_load_global(configfile)) {
                 fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
                         configfile);
@@ -216 +216 @@
 
         p = get_pass("New SMB password:", stdin_get);
+        if (p == NULL) {
+                return NULL;
+        }
 
         fstrcpy(new_pw, p);
@@ -221 +224 @@
 
         p = get_pass("Retype new SMB password:", stdin_get);
+        if (p == NULL) {
+                return NULL;
+        }
 
         if (strcmp(p, new_pw)) {
@@ -286 +292 @@
                 return False;
 
-        return secrets_store_ldap_pw(lp_ldap_admin_dn(), pw);
+        return secrets_store_ldap_pw(lp_ldap_admin_dn(talloc_tos()), pw);
 }
 
@@ -301 +307 @@
 
         if (local_flags & LOCAL_SET_LDAP_ADMIN_PW) {
-                char *ldap_admin_dn = lp_ldap_admin_dn();
+                char *ldap_admin_dn = lp_ldap_admin_dn(talloc_tos());
                 if ( ! *ldap_admin_dn ) {
                         DEBUG(0,("ERROR: 'ldap admin dn' not defined! Please check your smb.conf\n"));
@@ -310 +316 @@
                 if ( ! *ldap_secret ) {
                         new_passwd = prompt_for_new_password(stdin_passwd_get);
+                        if (new_passwd == NULL) {
+                                fprintf(stderr, "Failed to read new password!\n");
+                                exit(1);
+                        }
                         fstrcpy(ldap_secret, new_passwd);
                 }
@@ -370 +380 @@
                         SAFE_FREE(new_passwd);
                         new_passwd = smb_xstrdup(user_name);
-                        strlower_m(new_passwd);
+                        if (!strlower_m(new_passwd)) {
+                                fprintf(stderr, "strlower_m %s failed\n",
+                                        new_passwd);
+                                exit(1);
+                        }
                 }
 
@@ -379 +393 @@
 
                 slprintf(buf, sizeof(buf)-1, "%s$", user_name);
-                fstrcpy(user_name, buf);
+                strlcpy(user_name, buf, sizeof(user_name));
         } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
                 static fstring buf;
@@ -396 +410 @@
                 /* prepare uppercased and '$' terminated username */
                 slprintf(buf, sizeof(buf) - 1, "%s$", user_name);
-                fstrcpy(user_name, buf);
+                strlcpy(user_name, buf, sizeof(user_name));
 
         } else {
@@ -533 +547 @@
         if (remote_machine != NULL) {
                 old_pw = get_pass("Old SMB password:",stdin_passwd_get);
+                if (old_pw == NULL) {
+                        fprintf(stderr, "Unable to get old password.\n");
+                        exit(1);
+                }
         }
 
@@ -580 +598 @@
         }
 
-        load_case_tables();
+        smb_init_locale();
 
         local_flags = process_options(argc, argv, local_flags);
@@ -601 +619 @@
 
         if (local_flags & LOCAL_AM_ROOT) {
-                secrets_init();
-                return process_root(local_flags);
-        } 
-
-        ret = process_nonroot(local_flags);
+                bool ok;
+
+                ok = secrets_init();
+                if (!ok) {
+                        return 1;
+                }
+                ret = process_root(local_flags);
+        } else {
+                ret = process_nonroot(local_flags);
+        }
         TALLOC_FREE(frame);
         return ret;