From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 9 Aug 2006 03:53:48 +0000 (+0000)
Subject: ITS#4634
X-Git-Tag: OPENLDAP_REL_ENG_2_3_26~10
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=a4b5ac0eca3188260fee58dc924350c05d598e09;p=openldap

ITS#4634
---

diff --git a/CHANGES b/CHANGES
index 2374cd4c69..a1b8b8d5e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,10 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.26 Engineering
+	Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610)
 	Fixed slapd incorrect rebuilding of replica URI (ITS#4633)
+	Fixed slapo-ppolicy handling of default policy (ITS#4610)
 	Fixed back-monitor operations order via callbacks (ITS#4631)
-	Fixed libldap dnssrv bug with "not present" positive statement (ITS#4610)
 
 OpenLDAP 2.3.25 Release
 	Fixed liblber ber_bvreplace_x argument checks
diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c
index e8dcb151c3..b6a833c02b 100644
--- a/servers/slapd/overlays/ppolicy.c
+++ b/servers/slapd/overlays/ppolicy.c
@@ -326,6 +326,8 @@ ppolicy_get( Operation *op, Entry *e, PassPolicy *pp )
 
 	memset( pp, 0, sizeof(PassPolicy) );
 
+	pp->ad = slap_schema.si_ad_userPassword;
+
 	/* Users can change their own password by default */
     	pp->pwdAllowUserChange = 1;
 
@@ -354,8 +356,6 @@ ppolicy_get( Operation *op, Entry *e, PassPolicy *pp )
 #if 0	/* Only worry about userPassword for now */
 	if ((a = attr_find( pe->e_attrs, ad_pwdAttribute )))
 		slap_bv2ad( &a->a_vals[0], &pp->ad, &text );
-#else
-	pp->ad = slap_schema.si_ad_userPassword;
 #endif
 
 	if ( ( a = attr_find( pe->e_attrs, ad_pwdMinAge ) )
@@ -411,7 +411,7 @@ ppolicy_get( Operation *op, Entry *e, PassPolicy *pp )
 	return;
 
 defaultpol:
-	Debug( LDAP_DEBUG_ANY,
+	Debug( LDAP_DEBUG_TRACE,
 		"ppolicy_get: using default policy\n", 0, 0, 0 );
 	return;
 }