upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-31 20:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9343 Switch ppolicy_get to rely on ppolicy_operational

Browse source
This commit is contained in:
Ondřej Kuzník 2022-03-03 10:54:06 +00:00 committed by Quanah Gibson-Mount
parent db9da05171
commit 6a903a8cf1
1 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
servers/slapd/overlays/ppolicy.c
View file

@ -1137,40 +1137,25 @@ ppolicy_get_default( PassPolicy *pp )
static int
ppolicy_get( Operation *op, Entry *e, PassPolicy *pp )
{
slap_overinst *on = (slap_overinst *)op->o_bd->bd_info;
pp_info *pi = on->on_bi.bi_private;
BackendDB *bd, *bd_orig = op->o_bd;
AttributeDescription *ad = NULL;
Attribute *a;
BerVarray vals;
BerVarray vals = NULL;
int rc = LDAP_SUCCESS;
Entry *pe = NULL;
#if 0
const char *text;
#endif
ppolicy_get_default( pp );
ad = ad_pwdPolicySubentry;
if ( (a = attr_find( e->e_attrs, ad )) == NULL ) {
policy_rule *pr = pi->policy_rules;
/*
* entry has no password policy assigned - find the default one
*/
for ( pr = pi->policy_rules; pr; pr = pr->next ) {
if ( !dnIsSuffixScope( &e->e_nname, &pr->base, pr->scope ) ) continue;
if ( pr->filter && test_filter( op, e, pr->filter ) != LDAP_COMPARE_TRUE ) continue;
/* We found a match */
break;
}
if ( pr ) {
vals = &pr->policy_dn;
} else {
vals = &pi->def_policy;
}
if ( !vals->bv_val )
/* This could be an Add, make sure we pass the entry in */
rc = backend_attribute( op, e, &op->o_req_ndn,
ad_pwdPolicySubentry, &vals, ACL_NONE );
if ( rc || vals == NULL ) {
Debug( LDAP_DEBUG_ANY, "ppolicy_get: "
"got rc=%d getting value for policySubEntry\n", rc );
goto defaultpol;
}
} else {
vals = a->a_nvals;
if (vals[0].bv_val == NULL) {
@ -1366,7 +1351,7 @@ defaultpol:
op->o_bd = bd_orig;
}
if ( rc && !BER_BVISNULL( vals ) ) {
if ( rc && vals && !BER_BVISNULL( vals ) ) {
Debug( LDAP_DEBUG_ANY, "ppolicy_get: "
"policy subentry %s missing or invalid at '%s', "
"no policy will be applied!\n",