From 9953afba0c43ed70a3da726d6f86383ae6c306ef Mon Sep 17 00:00:00 2001 From: Mark Reynolds Date: Wed, 17 Jan 2018 08:38:00 -0500 Subject: [PATCH] Ticket 49370 - Add all the password policy defaults to a new local policy Description: When processing a local password policy we were not pulling in the defaults for the "on/off" settings. This patch addresses that. https://pagure.io/389-ds-base/issue/49370 Reviewed by: ? --- ldap/servers/slapd/pw.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ldap/servers/slapd/pw.c b/ldap/servers/slapd/pw.c index 75b194aac..4c4946972 100644 --- a/ldap/servers/slapd/pw.c +++ b/ldap/servers/slapd/pw.c @@ -1748,7 +1748,7 @@ new_passwdPolicy(Slapi_PBlock *pb, const char *dn) goto done; } - /* Set the default values */ + /* Set the default values (from libglobs.c) */ pwdpolicy->pw_mintokenlength = SLAPD_DEFAULT_PW_MINTOKENLENGTH; pwdpolicy->pw_minlength = SLAPD_DEFAULT_PW_MINLENGTH; pwdpolicy->pw_mindigits = SLAPD_DEFAULT_PW_MINDIGITS; @@ -1767,12 +1767,17 @@ new_passwdPolicy(Slapi_PBlock *pb, const char *dn) pwdpolicy->pw_lockduration = SLAPD_DEFAULT_PW_LOCKDURATION; pwdpolicy->pw_resetfailurecount = SLAPD_DEFAULT_PW_RESETFAILURECOUNT; pwdpolicy->pw_gracelimit = SLAPD_DEFAULT_PW_GRACELIMIT; - - /* set the default passwordLegacyPolicy setting */ - pwdpolicy->pw_is_legacy = 1; - - /* set passwordTrackUpdateTime */ + pwdpolicy->pw_storagescheme = slapdFrontendConfig->pw_storagescheme; pwdpolicy->pw_track_update_time = slapdFrontendConfig->pw_policy.pw_track_update_time; + pwdpolicy->pw_change = LDAP_ON; + pwdpolicy->pw_must_change = LDAP_OFF; + pwdpolicy->pw_syntax = LDAP_OFF; + pwdpolicy->pw_exp = LDAP_OFF; + pwdpolicy->pw_send_expiring = LDAP_OFF; + pwdpolicy->pw_history = LDAP_OFF; + pwdpolicy->pw_lockout = LDAP_OFF; + pwdpolicy->pw_unlock = LDAP_ON; + pwdpolicy->pw_is_legacy = LDAP_OFF; for (slapi_entry_first_attr(pw_entry, &attr); attr; slapi_entry_next_attr(pw_entry, attr, &attr)) { -- 2.13.6