summaryrefslogtreecommitdiff
path: root/source4/dsdb
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-09-25 18:03:31 +0200
committerMatthias Dieter Wallnöfer <mwallnoefer@yahoo.de>2009-10-02 17:28:04 +0200
commit2cbff7496e477f9af180a564dbd908ec2a968716 (patch)
tree79c9388c4d1565d828d2e96043097a0612257741 /source4/dsdb
parent6edb92f33785bb07f1bafc3c8729dc505282b9f7 (diff)
downloadsamba-2cbff7496e477f9af180a564dbd908ec2a968716.tar.gz
samba-2cbff7496e477f9af180a564dbd908ec2a968716.tar.bz2
samba-2cbff7496e477f9af180a564dbd908ec2a968716.zip
s4:samdb_set_password - Return the maximum password age when requested (not the minimum one)
Diffstat (limited to 'source4/dsdb')
-rw-r--r--source4/dsdb/common/util.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index a355cfbb22..ce74c7b19c 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -1597,7 +1597,7 @@ NTSTATUS samdb_set_password(struct ldb_context *ctx, TALLOC_CTX *mem_ctx,
"maxPwdAge", "minPwdAge", NULL };
NTTIME pwdLastSet;
uint32_t minPwdLength, pwdProperties, pwdHistoryLength;
- int64_t minPwdAge;
+ int64_t maxPwdAge, minPwdAge;
uint32_t userAccountControl;
struct samr_Password *sambaLMPwdHistory, *sambaNTPwdHistory,
*lmPwdHash, *ntPwdHash, *lmNewHash, *ntNewHash;
@@ -1671,6 +1671,7 @@ NTSTATUS samdb_set_password(struct ldb_context *ctx, TALLOC_CTX *mem_ctx,
minPwdLength = samdb_result_uint(res[0], "minPwdLength", 0);
pwdProperties = samdb_result_uint(res[0], "pwdProperties", 0);
pwdHistoryLength = samdb_result_uint(res[0], "pwdHistoryLength", 0);
+ maxPwdAge = samdb_result_int64(res[0], "maxPwdAge", 0);
minPwdAge = samdb_result_int64(res[0], "minPwdAge", 0);
if ((userAccountControl & UF_PASSWD_NOTREQD) != 0) {
@@ -1688,7 +1689,7 @@ NTSTATUS samdb_set_password(struct ldb_context *ctx, TALLOC_CTX *mem_ctx,
dominfo->min_password_length = minPwdLength;
dominfo->password_properties = pwdProperties;
dominfo->password_history_length = pwdHistoryLength;
- dominfo->max_password_age = minPwdAge;
+ dominfo->max_password_age = maxPwdAge;
dominfo->min_password_age = minPwdAge;
*_dominfo = dominfo;
}