From 9d297a6c91528a4c2e6a7c01889da2fd63252b89 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 14 Jun 2007 14:51:36 +0000 Subject: [PATCH] ctrl oid fix from HEAD --- servers/slapd/overlays/ppolicy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/slapd/overlays/ppolicy.c b/servers/slapd/overlays/ppolicy.c index dabab1df96..2c68c9d0af 100644 --- a/servers/slapd/overlays/ppolicy.c +++ b/servers/slapd/overlays/ppolicy.c @@ -356,6 +356,8 @@ account_locked( Operation *op, Entry *e, #define PPOLICY_EXPIRE 0x80L /* primitive + 0 */ #define PPOLICY_GRACE 0x81L /* primitive + 1 */ +static const char ppolicy_ctrl_oid[] = LDAP_CONTROL_PASSWORDPOLICYRESPONSE; + static LDAPControl * create_passcontrol( int exptime, int grace, LDAPPasswordPolicyError err ) { @@ -368,7 +370,7 @@ create_passcontrol( int exptime, int grace, LDAPPasswordPolicyError err ) if ( c == NULL ) { return NULL; } - c->ldctl_oid = LDAP_CONTROL_PASSWORDPOLICYRESPONSE; + c->ldctl_oid = (char *)ppolicy_ctrl_oid; c->ldctl_iscritical = 0; BER_BVZERO( &c->ldctl_value ); @@ -848,7 +850,7 @@ ctrls_cleanup( Operation *op, SlapReply *rs, LDAPControl **oldctrls ) assert( rs->sr_ctrls[0] != NULL ); for ( n = 0; rs->sr_ctrls[n]; n++ ) { - if ( !strcmp( rs->sr_ctrls[n]->ldctl_oid, LDAP_CONTROL_PASSWORDPOLICYRESPONSE) ) { + if ( rs->sr_ctrls[n]->ldctl_oid == ppolicy_ctrl_oid ) { ch_free( rs->sr_ctrls[n]->ldctl_value.bv_val ); ch_free( rs->sr_ctrls[n] ); rs->sr_ctrls[n] = (LDAPControl *)(-1); -- 2.39.2