diff options
Diffstat (limited to 'source3/passdb/pdb_get_set.c')
| -rw-r--r-- | source3/passdb/pdb_get_set.c | 310 |
1 files changed, 139 insertions, 171 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index 5dfa8667fe..07474693dd 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -37,7 +37,7 @@ #define PDB_NOT_QUITE_NULL "" /********************************************************************* - Collection of get...() functions for SAM_ACCOUNT. + Collection of get...() functions for SAM_ACCOUNT_INFO. ********************************************************************/ uint16 pdb_get_acct_ctrl (const SAM_ACCOUNT *sampass) @@ -178,28 +178,12 @@ const DOM_SID *pdb_get_group_sid(const SAM_ACCOUNT *sampass) * @return the flags indicating the members initialised in the struct. **/ -enum pdb_value_state pdb_get_init_flags (const SAM_ACCOUNT *sampass, enum pdb_elements element) +uint32 pdb_get_init_flag (const SAM_ACCOUNT *sampass) { - enum pdb_value_state ret = PDB_DEFAULT; - - if (!sampass || !sampass->private.change_flags || !sampass->private.set_flags) - return ret; - - if (bitmap_query(sampass->private.set_flags, element)) { - DEBUG(10, ("element %d: SET\n", element)); - ret = PDB_SET; - } - - if (bitmap_query(sampass->private.change_flags, element)) { - DEBUG(10, ("element %d: CHANGED\n", element)); - ret = PDB_CHANGED; - } - - if (ret == PDB_DEFAULT) { - DEBUG(10, ("element %d: DEFAULT\n", element)); - } - - return ret; + if (sampass) + return sampass->private.init_flag; + else + return FLAG_SAM_UNINIT; } uid_t pdb_get_uid (const SAM_ACCOUNT *sampass) @@ -322,7 +306,7 @@ const char* pdb_get_munged_dial (const SAM_ACCOUNT *sampass) return (NULL); } -uint32 pdb_get_unknown_3 (const SAM_ACCOUNT *sampass) +uint32 pdb_get_unknown3 (const SAM_ACCOUNT *sampass) { if (sampass) return (sampass->private.unknown_3); @@ -330,7 +314,7 @@ uint32 pdb_get_unknown_3 (const SAM_ACCOUNT *sampass) return (-1); } -uint32 pdb_get_unknown_5 (const SAM_ACCOUNT *sampass) +uint32 pdb_get_unknown5 (const SAM_ACCOUNT *sampass) { if (sampass) return (sampass->private.unknown_5); @@ -338,7 +322,7 @@ uint32 pdb_get_unknown_5 (const SAM_ACCOUNT *sampass) return (-1); } -uint32 pdb_get_unknown_6 (const SAM_ACCOUNT *sampass) +uint32 pdb_get_unknown6 (const SAM_ACCOUNT *sampass) { if (sampass) return (sampass->private.unknown_6); @@ -347,97 +331,113 @@ uint32 pdb_get_unknown_6 (const SAM_ACCOUNT *sampass) } /********************************************************************* - Collection of set...() functions for SAM_ACCOUNT. + Collection of set...() functions for SAM_ACCOUNT_INFO. ********************************************************************/ -BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 acct_ctrl, enum pdb_value_state flag) +BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 flags) { if (!sampass) return False; - sampass->private.acct_ctrl = acct_ctrl; - - return pdb_set_init_flags(sampass, PDB_ACCTCTRL, flag); + if (sampass) { + sampass->private.acct_ctrl = flags; + return True; + } + + return False; } -BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime, BOOL store) { if (!sampass) return False; sampass->private.logon_time = mytime; - return pdb_set_init_flags(sampass, PDB_LOGONTIME, flag); + if (store) + pdb_set_init_flag(sampass, FLAG_SAM_LOGONTIME); + + return True; } -BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime, BOOL store) { if (!sampass) return False; sampass->private.logoff_time = mytime; - return pdb_set_init_flags(sampass, PDB_LOGOFFTIME, flag); + if (store) + pdb_set_init_flag(sampass, FLAG_SAM_LOGOFFTIME); + + return True; } -BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime, BOOL store) { if (!sampass) return False; sampass->private.kickoff_time = mytime; - return pdb_set_init_flags(sampass, PDB_KICKOFFTIME, flag); + if (store) + pdb_set_init_flag(sampass, FLAG_SAM_KICKOFFTIME); + + return True; } -BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime, BOOL store) { if (!sampass) return False; sampass->private.pass_can_change_time = mytime; - return pdb_set_init_flags(sampass, PDB_CANCHANGETIME, flag); + if (store) + pdb_set_init_flag(sampass, FLAG_SAM_CANCHANGETIME); + + return True; } -BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime, BOOL store) { if (!sampass) return False; sampass->private.pass_must_change_time = mytime; - return pdb_set_init_flags(sampass, PDB_MUSTCHANGETIME, flag); + if (store) + pdb_set_init_flag(sampass, FLAG_SAM_MUSTCHANGETIME); + + return True; } -BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime, enum pdb_value_state flag) +BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime) { if (!sampass) return False; sampass->private.pass_last_set_time = mytime; - return pdb_set_init_flags(sampass, PDB_PASSLASTSET, flag); + return True; } -BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len, enum pdb_value_state flag) +BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len) { if (!sampass) return False; sampass->private.hours_len = len; - - return pdb_set_init_flags(sampass, PDB_HOURSLEN, flag); + return True; } -BOOL pdb_set_logon_divs (SAM_ACCOUNT *sampass, uint16 hours, enum pdb_value_state flag) +BOOL pdb_set_logon_divs (SAM_ACCOUNT *sampass, uint16 hours) { if (!sampass) return False; sampass->private.logon_divs = hours; - - return pdb_set_init_flags(sampass, PDB_LOGONDIVS, flag); + return True; } /** @@ -447,70 +447,18 @@ BOOL pdb_set_logon_divs (SAM_ACCOUNT *sampass, uint16 hours, enum pdb_value_stat * this flag is only added. **/ -BOOL pdb_set_init_flags (SAM_ACCOUNT *sampass, enum pdb_elements element, enum pdb_value_state value_flag) +BOOL pdb_set_init_flag (SAM_ACCOUNT *sampass, uint32 flag) { - if (!sampass || !sampass->mem_ctx) + if (!sampass) return False; - if (!sampass->private.set_flags) { - if ((sampass->private.set_flags = - bitmap_talloc(sampass->mem_ctx, - PDB_COUNT))==NULL) { - DEBUG(0,("bitmap_talloc failed\n")); - return False; - } - } - if (!sampass->private.change_flags) { - if ((sampass->private.change_flags = - bitmap_talloc(sampass->mem_ctx, - PDB_COUNT))==NULL) { - DEBUG(0,("bitmap_talloc failed\n")); - return False; - } - } - - switch(value_flag) { - case PDB_CHANGED: - if (!bitmap_set(sampass->private.change_flags, element)) { - DEBUG(0,("Can't set flag: %d in change_flags.\n",element)); - return False; - } - if (!bitmap_set(sampass->private.set_flags, element)) { - DEBUG(0,("Can't set flag: %d in set_falgs.\n",element)); - return False; - } - DEBUG(10, ("element %d -> now CHANGED\n", element)); - break; - case PDB_SET: - if (!bitmap_clear(sampass->private.change_flags, element)) { - DEBUG(0,("Can't set flag: %d in change_flags.\n",element)); - return False; - } - if (!bitmap_set(sampass->private.set_flags, element)) { - DEBUG(0,("Can't set flag: %d in set_falgs.\n",element)); - return False; - } - DEBUG(10, ("element %d -> now SET\n", element)); - break; - case PDB_DEFAULT: - default: - if (!bitmap_clear(sampass->private.change_flags, element)) { - DEBUG(0,("Can't set flag: %d in change_flags.\n",element)); - return False; - } - if (!bitmap_clear(sampass->private.set_flags, element)) { - DEBUG(0,("Can't set flag: %d in set_falgs.\n",element)); - return False; - } - DEBUG(10, ("element %d -> now DEFAULT\n", element)); - break; - } + sampass->private.init_flag |= flag; return True; } -BOOL pdb_set_uid (SAM_ACCOUNT *sampass, const uid_t uid, enum pdb_value_state flag) -{ +BOOL pdb_set_uid (SAM_ACCOUNT *sampass, const uid_t uid) +{ if (!sampass) return False; @@ -518,11 +466,13 @@ BOOL pdb_set_uid (SAM_ACCOUNT *sampass, const uid_t uid, enum pdb_value_state fl (int)uid, (int)sampass->private.uid)); sampass->private.uid = uid; - - return pdb_set_init_flags(sampass, PDB_UID, flag); + pdb_set_init_flag(sampass, FLAG_SAM_UID); + + return True; + } -BOOL pdb_set_gid (SAM_ACCOUNT *sampass, const gid_t gid, enum pdb_value_state flag) +BOOL pdb_set_gid (SAM_ACCOUNT *sampass, const gid_t gid) { if (!sampass) return False; @@ -531,11 +481,13 @@ BOOL pdb_set_gid (SAM_ACCOUNT *sampass, const gid_t gid, enum pdb_value_state fl (int)gid, (int)sampass->private.gid)); sampass->private.gid = gid; + pdb_set_init_flag(sampass, FLAG_SAM_GID); + + return True; - return pdb_set_init_flags(sampass, PDB_GID, flag); } -BOOL pdb_set_user_sid (SAM_ACCOUNT *sampass, DOM_SID *u_sid, enum pdb_value_state flag) +BOOL pdb_set_user_sid (SAM_ACCOUNT *sampass, DOM_SID *u_sid) { if (!sampass || !u_sid) return False; @@ -544,14 +496,13 @@ BOOL pdb_set_user_sid (SAM_ACCOUNT *sampass, DOM_SID *u_sid, enum pdb_value_stat DEBUG(10, ("pdb_set_user_sid: setting user sid %s\n", sid_string_static(&sampass->private.user_sid))); - - return pdb_set_init_flags(sampass, PDB_USERSID, flag); + + return True; } -BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid, enum pdb_value_state flag) +BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid) { DOM_SID new_sid; - if (!sampass || !u_sid) return False; @@ -563,7 +514,7 @@ BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid, enum pdb return False; } - if (!pdb_set_user_sid(sampass, &new_sid, flag)) { + if (!pdb_set_user_sid(sampass, &new_sid)) { DEBUG(1, ("pdb_set_user_sid_from_string: could not set sid %s on SAM_ACCOUNT!\n", u_sid)); return False; } @@ -571,7 +522,7 @@ BOOL pdb_set_user_sid_from_string (SAM_ACCOUNT *sampass, fstring u_sid, enum pdb return True; } -BOOL pdb_set_group_sid (SAM_ACCOUNT *sampass, DOM_SID *g_sid, enum pdb_value_state flag) +BOOL pdb_set_group_sid (SAM_ACCOUNT *sampass, DOM_SID *g_sid) { if (!sampass || !g_sid) return False; @@ -581,10 +532,10 @@ BOOL pdb_set_group_sid (SAM_ACCOUNT *sampass, DOM_SID *g_sid, enum pdb_value_sta DEBUG(10, ("pdb_set_group_sid: setting group sid %s\n", sid_string_static(&sampass->private.group_sid))); - return pdb_set_init_flags(sampass, PDB_GROUPSID, flag); + return True; } -BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pdb_value_state flag) +BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid) { DOM_SID new_sid; if (!sampass || !g_sid) @@ -598,7 +549,7 @@ BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pd return False; } - if (!pdb_set_group_sid(sampass, &new_sid, flag)) { + if (!pdb_set_group_sid(sampass, &new_sid)) { DEBUG(1, ("pdb_set_group_sid_from_string: could not set sid %s on SAM_ACCOUNT!\n", g_sid)); return False; } @@ -609,8 +560,8 @@ BOOL pdb_set_group_sid_from_string (SAM_ACCOUNT *sampass, fstring g_sid, enum pd Set the user's UNIX name. ********************************************************************/ -BOOL pdb_set_username(SAM_ACCOUNT *sampass, const char *username, enum pdb_value_state flag) -{ +BOOL pdb_set_username(SAM_ACCOUNT *sampass, const char *username) +{ if (!sampass) return False; @@ -628,16 +579,16 @@ BOOL pdb_set_username(SAM_ACCOUNT *sampass, const char *username, enum pdb_value } else { sampass->private.username = PDB_NOT_QUITE_NULL; } - - return pdb_set_init_flags(sampass, PDB_USERNAME, flag); + + return True; } /********************************************************************* Set the domain name. ********************************************************************/ -BOOL pdb_set_domain(SAM_ACCOUNT *sampass, const char *domain, enum pdb_value_state flag) -{ +BOOL pdb_set_domain(SAM_ACCOUNT *sampass, const char *domain) +{ if (!sampass) return False; @@ -656,14 +607,14 @@ BOOL pdb_set_domain(SAM_ACCOUNT *sampass, const char *domain, enum pdb_value_sta sampass->private.domain = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_DOMAIN, flag); + return True; } /********************************************************************* Set the user's NT name. ********************************************************************/ -BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, const char *nt_username, enum pdb_value_state flag) +BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, const char *nt_username) { if (!sampass) return False; @@ -683,14 +634,14 @@ BOOL pdb_set_nt_username(SAM_ACCOUNT *sampass, const char *nt_username, enum pdb sampass->private.nt_username = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_NTUSERNAME, flag); + return True; } /********************************************************************* Set the user's full name. ********************************************************************/ -BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *full_name, enum pdb_value_state flag) +BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *full_name) { if (!sampass) return False; @@ -710,14 +661,14 @@ BOOL pdb_set_fullname(SAM_ACCOUNT *sampass, const char *full_name, enum pdb_valu sampass->private.full_name = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_FULLNAME, flag); + return True; } /********************************************************************* Set the user's logon script. ********************************************************************/ -BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, enum pdb_value_state flag) +BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, BOOL store) { if (!sampass) return False; @@ -737,14 +688,19 @@ BOOL pdb_set_logon_script(SAM_ACCOUNT *sampass, const char *logon_script, enum p sampass->private.logon_script = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_LOGONSCRIPT, flag); + if (store) { + DEBUG(10, ("pdb_set_logon_script: setting logon script sam flag!\n")); + pdb_set_init_flag(sampass, FLAG_SAM_LOGONSCRIPT); + } + + return True; } /********************************************************************* Set the user's profile path. ********************************************************************/ -BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, enum pdb_value_state flag) +BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, BOOL store) { if (!sampass) return False; @@ -764,14 +720,19 @@ BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, const char *profile_path, enum sampass->private.profile_path = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_PROFILE, flag); + if (store) { + DEBUG(10, ("pdb_set_profile_path: setting profile path sam flag!\n")); + pdb_set_init_flag(sampass, FLAG_SAM_PROFILE); + } + + return True; } /********************************************************************* Set the user's directory drive. ********************************************************************/ -BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, enum pdb_value_state flag) +BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, BOOL store) { if (!sampass) return False; @@ -791,14 +752,19 @@ BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, const char *dir_drive, enum pdb_va sampass->private.dir_drive = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_DRIVE, flag); + if (store) { + DEBUG(10, ("pdb_set_dir_drive: setting dir drive sam flag!\n")); + pdb_set_init_flag(sampass, FLAG_SAM_DRIVE); + } + + return True; } /********************************************************************* Set the user's home directory. ********************************************************************/ -BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *home_dir, enum pdb_value_state flag) +BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *home_dir, BOOL store) { if (!sampass) return False; @@ -818,14 +784,19 @@ BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, const char *home_dir, enum pdb_value sampass->private.home_dir = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_SMBHOME, flag); + if (store) { + DEBUG(10, ("pdb_set_homedir: setting home dir sam flag!\n")); + pdb_set_init_flag(sampass, FLAG_SAM_SMBHOME); + } + + return True; } /********************************************************************* Set the user's unix home directory. ********************************************************************/ -BOOL pdb_set_unix_homedir (SAM_ACCOUNT *sampass, const char *unix_home_dir, enum pdb_value_state flag) +BOOL pdb_set_unix_homedir (SAM_ACCOUNT *sampass, const char *unix_home_dir) { if (!sampass) return False; @@ -846,14 +817,14 @@ BOOL pdb_set_unix_homedir (SAM_ACCOUNT *sampass, const char *unix_home_dir, enum sampass->private.unix_home_dir = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_UNIXHOMEDIR, flag); + return True; } /********************************************************************* Set the user's account description. ********************************************************************/ -BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, const char *acct_desc, enum pdb_value_state flag) +BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, const char *acct_desc) { if (!sampass) return False; @@ -870,14 +841,14 @@ BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, const char *acct_desc, enum pdb_va sampass->private.acct_desc = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_ACCTDESC, flag); + return True; } /********************************************************************* Set the user's workstation allowed list. ********************************************************************/ -BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, const char *workstations, enum pdb_value_state flag) +BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, const char *workstations) { if (!sampass) return False; @@ -897,14 +868,14 @@ BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, const char *workstations, enum sampass->private.workstations = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_WORKSTATIONS, flag); + return True; } /********************************************************************* Set the user's 'unknown_str', whatever the heck this actually is... ********************************************************************/ -BOOL pdb_set_unknown_str (SAM_ACCOUNT *sampass, const char *unknown_str, enum pdb_value_state flag) +BOOL pdb_set_unknown_str (SAM_ACCOUNT *sampass, const char *unknown_str) { if (!sampass) return False; @@ -921,14 +892,14 @@ BOOL pdb_set_unknown_str (SAM_ACCOUNT *sampass, const char *unknown_str, enum pd sampass->private.unknown_str = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_UNKNOWNSTR, flag); + return True; } /********************************************************************* Set the user's dial string. ********************************************************************/ -BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, const char *munged_dial, enum pdb_value_state flag) +BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, const char *munged_dial) { if (!sampass) return False; @@ -945,14 +916,14 @@ BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, const char *munged_dial, enum pd sampass->private.munged_dial = PDB_NOT_QUITE_NULL; } - return pdb_set_init_flags(sampass, PDB_MUNGEDDIAL, flag); + return True; } /********************************************************************* Set the user's NT hash. ********************************************************************/ -BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[NT_HASH_LEN], enum pdb_value_state flag) +BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 *pwd) { if (!sampass) return False; @@ -961,14 +932,14 @@ BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[NT_HASH_LEN], enum sampass->private.nt_pw = data_blob(pwd, NT_HASH_LEN); - return pdb_set_init_flags(sampass, PDB_NTPASSWD, flag); + return True; } /********************************************************************* Set the user's LM hash. ********************************************************************/ -BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[LM_HASH_LEN], enum pdb_value_state flag) +BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[16]) { if (!sampass) return False; @@ -977,7 +948,7 @@ BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[LM_HASH_LEN], sampass->private.lm_pw = data_blob(pwd, LM_HASH_LEN); - return pdb_set_init_flags(sampass, PDB_LMPASSWD, flag); + return True; } /********************************************************************* @@ -985,7 +956,7 @@ BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, const uint8 pwd[LM_HASH_LEN], below) ********************************************************************/ -BOOL pdb_set_plaintext_pw_only (SAM_ACCOUNT *sampass, const char *password, enum pdb_value_state flag) +BOOL pdb_set_plaintext_pw_only (SAM_ACCOUNT *sampass, const char *password) { if (!sampass) return False; @@ -1005,40 +976,37 @@ BOOL pdb_set_plaintext_pw_only (SAM_ACCOUNT *sampass, const char *password, enum sampass->private.plaintext_pw = NULL; } - return pdb_set_init_flags(sampass, PDB_PLAINTEXT_PW, flag); + return True; } -BOOL pdb_set_unknown_3 (SAM_ACCOUNT *sampass, uint32 unkn, enum pdb_value_state flag) +BOOL pdb_set_unknown_3 (SAM_ACCOUNT *sampass, uint32 unkn) { if (!sampass) return False; sampass->private.unknown_3 = unkn; - - return pdb_set_init_flags(sampass, PDB_UNKNOWN3, flag); + return True; } -BOOL pdb_set_unknown_5 (SAM_ACCOUNT *sampass, uint32 unkn, enum pdb_value_state flag) +BOOL pdb_set_unknown_5 (SAM_ACCOUNT *sampass, uint32 unkn) { if (!sampass) return False; sampass->private.unknown_5 = unkn; - - return pdb_set_init_flags(sampass, PDB_UNKNOWN5, flag); + return True; } -BOOL pdb_set_unknown_6 (SAM_ACCOUNT *sampass, uint32 unkn, enum pdb_value_state flag) +BOOL pdb_set_unknown_6 (SAM_ACCOUNT *sampass, uint32 unkn) { if (!sampass) return False; sampass->private.unknown_6 = unkn; - - return pdb_set_init_flags(sampass, PDB_UNKNOWN6, flag); + return True; } -BOOL pdb_set_hours (SAM_ACCOUNT *sampass, const uint8 *hours, enum pdb_value_state flag) +BOOL pdb_set_hours (SAM_ACCOUNT *sampass, const uint8 *hours) { if (!sampass) return False; @@ -1050,7 +1018,7 @@ BOOL pdb_set_hours (SAM_ACCOUNT *sampass, const uint8 *hours, enum pdb_value_sta memcpy (sampass->private.hours, hours, MAX_HOURS_LEN); - return pdb_set_init_flags(sampass, PDB_HOURS, flag); + return True; } @@ -1068,17 +1036,17 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass) if (!sampass) return False; - if (!pdb_set_pass_last_set_time (sampass, time(NULL), PDB_CHANGED)) + if (!pdb_set_pass_last_set_time (sampass, time(NULL))) return False; if (!account_policy_get(AP_MAX_PASSWORD_AGE, &expire) || (expire==(uint32)-1)) { - if (!pdb_set_pass_must_change_time (sampass, get_time_t_max(), PDB_CHANGED)) + if (!pdb_set_pass_must_change_time (sampass, get_time_t_max(), False)) return False; } else { if (!pdb_set_pass_must_change_time (sampass, pdb_get_pass_last_set_time(sampass) - + expire, PDB_CHANGED)) + + expire, True)) return False; } @@ -1100,13 +1068,13 @@ BOOL pdb_set_plaintext_passwd (SAM_ACCOUNT *sampass, const char *plaintext) nt_lm_owf_gen (plaintext, new_nt_p16, new_lanman_p16); - if (!pdb_set_nt_passwd (sampass, new_nt_p16, PDB_CHANGED)) + if (!pdb_set_nt_passwd (sampass, new_nt_p16)) return False; - if (!pdb_set_lanman_passwd (sampass, new_lanman_p16, PDB_CHANGED)) + if (!pdb_set_lanman_passwd (sampass, new_lanman_p16)) return False; - if (!pdb_set_plaintext_pw_only (sampass, plaintext, PDB_CHANGED)) + if (!pdb_set_plaintext_pw_only (sampass, plaintext)) return False; if (!pdb_set_pass_changed_now (sampass)) |