s4:samdb_set_password - Return the maximum password age when requested (not the minim...

[ira/wip.git] / source4 / dsdb / common / util.c

diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index a355cfbb22811415a7e4b796bdeedb57f7e58d26..ce74c7b19c1a83383709b248de98d32067c79acd 100644 (file)
--- 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;
                                              "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;
        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);
        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) {
        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->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;
        }
                dominfo->min_password_age        = minPwdAge;
                *_dominfo = dominfo;
        }