Changeset 988 for vendor/current/source3/utils/pdbedit.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/pdbedit.c (modified) (22 diffs)

vendor/current/source3/utils/pdbedit.c

@@ -56 +56 @@
 #define BIT_KICKOFFTIME 0x20000000
 #define BIT_DESCRIPTION 0x40000000
+#define BIT_PWSETNTHASH 0x80000000
 
 #define MASK_ALWAYS_GOOD        0x0000001F
-#define MASK_USER_GOOD          0x60405FE0
+#define MASK_USER_GOOD          0xE0405FE0
 
 static int get_sid_from_cli_string(struct dom_sid *sid, const char *str_sid)
@@ -176 +177 @@
 static int export_groups (struct pdb_methods *in, struct pdb_methods *out)
 {
-        GROUP_MAP *maps = NULL;
+        GROUP_MAP **maps = NULL;
         size_t i, entries = 0;
         NTSTATUS status;
@@ -189 +190 @@
 
         for (i=0; i<entries; i++) {
-                out->add_group_mapping_entry(out, &(maps[i]));
-        }
-
-        SAFE_FREE( maps );
+                out->add_group_mapping_entry(out, maps[i]);
+        }
+
+        TALLOC_FREE(maps);
 
         return 0;
@@ -318 +319 @@
                 pdb_sethexhours(temp, hours);
                 printf ("Logon hours         : %s\n", temp);
+                if (smbpwdstyle){
+                        pdb_sethexpwd(temp, pdb_get_lanman_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
+                        printf ("LM hash             : %s\n", temp);
+                        pdb_sethexpwd(temp, pdb_get_nt_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
+                        printf ("NT hash             : %s\n", temp);
+                }       
 
         } else if (smbpwdstyle) {
@@ -333 +340 @@
                        nt_passwd,
                        pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
-                       (uint32)convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sam_pwent)));
+                       (uint32_t)convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sam_pwent)));
         } else {
                 uid = nametouid(pdb_get_username(sam_pwent));
@@ -500 +507 @@
                          const char *user_sid, const char *user_domain,
                          const bool badpw, const bool hours,
-                         const char *kickoff_time)
+                         const char *kickoff_time, const char *str_hex_pwd)
 {
         bool updated_autolock = False, updated_badpw = False;
@@ -602 +609 @@
                 pdb_set_kickoff_time(sam_pwent, value, PDB_CHANGED);
         }
+        if (str_hex_pwd) {
+                unsigned char  new_nt_p16[NT_HASH_LEN];
+                if(strlen(str_hex_pwd) != (NT_HASH_LEN *2)){
+                        fprintf(stderr, "Invalid hash\n");
+                        return -1;
+                }
+                                         
+                pdb_gethexpwd(str_hex_pwd, new_nt_p16);
+                
+                if (!pdb_set_nt_passwd (sam_pwent, new_nt_p16 , PDB_CHANGED)) {
+                        fprintf(stderr, "Failed to set password from nt-hash\n");
+                        return -1;
+                }       
+
+                if (!pdb_set_pass_last_set_time (sam_pwent, time(NULL), PDB_CHANGED)){
+                        fprintf(stderr, "Failed to set last password set time\n");
+                        return -1;
+                }       
+                if (!pdb_update_history(sam_pwent, new_nt_p16)){
+                        fprintf(stderr, "Failed to update password history\n");
+                        return -1;
+                }
+        }
 
         if (NT_STATUS_IS_OK(pdb_update_sam_account(sam_pwent))) {
-                print_user_info(username, True, False);
+                
+                print_user_info(username, True, (str_hex_pwd != NULL ));
         } else {
                 fprintf (stderr, "Unable to modify entry!\n");
@@ -656 +687 @@
         }
 
-        strlower_m(name);
+        if (!strlower_m(name)) {
+                fprintf(stderr, "strlower_m %s failed\n", name);
+                TALLOC_FREE(sam_pwent);
+                return -1;
+        }
 
         ret = pdb_getsampwnam(sam_pwent, name);
@@ -854 +889 @@
         }
 
-        strlower_m(name);
+        if (!strlower_m(name)) {
+                fprintf(stderr, "strlower_m %s failed\n", name);
+                return -1;
+        }
 
         flags = LOCAL_ADD_USER | LOCAL_TRUST_ACCOUNT | LOCAL_SET_PASSWORD;
@@ -959 +997 @@
                 fprintf (stderr,
                          "machine %s does not exist in the passdb\n", name);
-                return -1;
                 TALLOC_FREE(samaccount);
+                return -1;
         }
 
@@ -977 +1015 @@
 **********************************************************/
 
-int main (int argc, char **argv)
+int main(int argc, const char **argv)
 {
         static int list_users = False;
@@ -986 +1024 @@
         static int delete_user = False;
         static int modify_user = False;
-        uint32  setparms, checkparms;
+        uint32_t   setparms, checkparms;
         int opt;
         static char *full_name = NULL;
@@ -1015 +1053 @@
         struct pdb_methods *bin, *bout;
         static char *kickoff_time = NULL;
+        static char *str_hex_pwd = NULL;
         TALLOC_CTX *frame = talloc_stackframe();
         NTSTATUS status;
@@ -1052 +1091 @@
                 {"password-from-stdin", 't', POPT_ARG_NONE, &pw_from_stdin, 0, "get password from standard in", NULL},
                 {"kickoff-time", 'K', POPT_ARG_STRING, &kickoff_time, 0, "set the kickoff time", NULL},
+                {"set-nt-hash", 0, POPT_ARG_STRING, &str_hex_pwd, 0, "set password from nt-hash", NULL},
                 POPT_COMMON_SAMBA
                 POPT_TABLEEND
@@ -1058 +1098 @@
         bin = bout = NULL;
 
-        load_case_tables();
+        smb_init_locale();
 
         setup_logging("pdbedit", DEBUG_STDOUT);
 
-        pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
+        pc = poptGetContext(NULL, argc, argv, long_options,
                             POPT_CONTEXT_KEEP_FIRST);
 
@@ -1078 +1118 @@
                 user_name = poptGetArg(pc);
 
-        if (!lp_load(get_dyn_CONFIGFILE(),True,False,False,True)) {
+        if (!lp_load_global(get_dyn_CONFIGFILE())) {
                 fprintf(stderr, "Can't load %s - run testparm to debug it\n", get_dyn_CONFIGFILE());
                 exit(1);
@@ -1112 +1152 @@
                         (hours_reset ? BIT_LOGONHOURS : 0) +
                         (kickoff_time ? BIT_KICKOFFTIME : 0) +
+                        (str_hex_pwd ? BIT_PWSETNTHASH : 0 ) +
                         (acct_desc ? BIT_DESCRIPTION : 0);
+                        
 
         if (setparms & BIT_BACKEND) {
@@ -1118 +1160 @@
                  * This way we can use regular pdb functions for default
                  * operations that do not involve passdb migrations */
-                lp_set_passdb_backend(backend);
+                lp_set_cmdline("passdb backend", backend);
         } else {
                 backend = lp_passdb_backend();
@@ -1143 +1185 @@
                         int count;
                         int i;
-                        account_policy_names_list(&names, &count);
+                        account_policy_names_list(talloc_tos(), &names, &count);
                         fprintf(stderr, "No account policy by that name!\n");
                         if (count !=0) {
@@ -1151 +1193 @@
                                 }
                         }
-                        SAFE_FREE(names);
+                        TALLOC_FREE(names);
                         exit(1);
                 }
@@ -1175 +1217 @@
 
         if (reset_account_policies) {
-                if (!reinit_account_policies()) {
+                if (reinit_account_policies()) {
                         exit(1);
                 }
@@ -1309 +1351 @@
                                                      user_sid, user_domain,
                                                      badpw_reset, hours_reset,
-                                                     kickoff_time);
+                                                     kickoff_time, str_hex_pwd);
                         }
                 }