diff options
| author | Günther Deschner <gd@samba.org> | 2005-02-12 00:51:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:38 -0500 |
| commit | 6c84ecb55657ae28eb739a72164f6d7251dc627f (patch) | |
| tree | dee7daed349a0f0b71cba5008c50fa4db294c0a8 /source3/passdb/pdb_get_set.c | |
| parent | 0f87a9ada358020874206cf65db5c62a0a83ddbb (diff) | |
| download | samba-6c84ecb55657ae28eb739a72164f6d7251dc627f.tar.gz samba-6c84ecb55657ae28eb739a72164f6d7251dc627f.tar.bz2 samba-6c84ecb55657ae28eb739a72164f6d7251dc627f.zip | |
r5349: After talking with Jerry, reverted the addition of account policies to
passdb in 3_0 (they are still in trunk).
Guenther
(This used to be commit fdf9bdbbac1d8d4f3b3e1fc7e49c1e659b9301b1)
Diffstat (limited to 'source3/passdb/pdb_get_set.c')
| -rw-r--r-- | source3/passdb/pdb_get_set.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/passdb/pdb_get_set.c b/source3/passdb/pdb_get_set.c index e0fc0ef280..4b59b5fdf9 100644 --- a/source3/passdb/pdb_get_set.c +++ b/source3/passdb/pdb_get_set.c @@ -1123,7 +1123,7 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass) if (!pdb_set_pass_last_set_time (sampass, time(NULL), PDB_CHANGED)) return False; - if (!pdb_get_account_policy(AP_MAX_PASSWORD_AGE, &expire) + if (!account_policy_get(AP_MAX_PASSWORD_AGE, &expire) || (expire==(uint32)-1) || (expire == 0)) { if (!pdb_set_pass_must_change_time (sampass, get_time_t_max(), PDB_CHANGED)) return False; @@ -1134,7 +1134,7 @@ BOOL pdb_set_pass_changed_now (SAM_ACCOUNT *sampass) return False; } - if (!pdb_get_account_policy(AP_MIN_PASSWORD_AGE, &min_age) + if (!account_policy_get(AP_MIN_PASSWORD_AGE, &min_age) || (min_age==(uint32)-1)) { if (!pdb_set_pass_can_change_time (sampass, 0, PDB_CHANGED)) return False; @@ -1189,7 +1189,7 @@ BOOL pdb_set_plaintext_passwd (SAM_ACCOUNT *sampass, const char *plaintext) if (pdb_get_acct_ctrl(sampass) & ACB_NORMAL) { uchar *pwhistory; uint32 pwHistLen; - pdb_get_account_policy(AP_PASSWORD_HISTORY, &pwHistLen); + account_policy_get(AP_PASSWORD_HISTORY, &pwHistLen); if (pwHistLen != 0){ uint32 current_history_len; /* We need to make sure we don't have a race condition here - the |