Commit 20fd4706 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6620

parent 5fd445c5
...@@ -49,6 +49,7 @@ OpenLDAP 2.4.24 Engineering ...@@ -49,6 +49,7 @@ OpenLDAP 2.4.24 Engineering
Fixed slapo-pcache callback freeing (ITS#6640) Fixed slapo-pcache callback freeing (ITS#6640)
Fixed slapo-pcache to ignore undefined attrs (ITS#6600) Fixed slapo-pcache to ignore undefined attrs (ITS#6600)
Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608) Fixed slapo-ppolicy don't update opattrs on consumers (ITS#6608)
Fixed slapo-ppolicy to allow userPassword deletion (ITS#6620)
Fixed slapo-refint when last group member is deleted (ITS#6663) Fixed slapo-refint when last group member is deleted (ITS#6663)
Fixed slapo-refint with subtree rename (ITS#6730) Fixed slapo-refint with subtree rename (ITS#6730)
Fixed slapo-sssvlv initialization (ITS#6649) Fixed slapo-sssvlv initialization (ITS#6649)
......
...@@ -1969,23 +1969,26 @@ do_modify: ...@@ -1969,23 +1969,26 @@ do_modify:
timestamp.bv_len = sizeof(timebuf); timestamp.bv_len = sizeof(timebuf);
slap_timestamp( &now, &timestamp ); slap_timestamp( &now, &timestamp );
mods = (Modifications *) ch_calloc( sizeof( Modifications ), 1 ); mods = NULL;
mods->sml_desc = ad_pwdChangedTime;
if (pwmop != LDAP_MOD_DELETE) { if (pwmop != LDAP_MOD_DELETE) {
mods = (Modifications *) ch_calloc( sizeof( Modifications ), 1 );
mods->sml_op = LDAP_MOD_REPLACE; mods->sml_op = LDAP_MOD_REPLACE;
mods->sml_numvals = 1; mods->sml_numvals = 1;
mods->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) ); mods->sml_values = (BerVarray) ch_malloc( 2 * sizeof( struct berval ) );
ber_dupbv( &mods->sml_values[0], &timestamp ); ber_dupbv( &mods->sml_values[0], &timestamp );
BER_BVZERO( &mods->sml_values[1] ); BER_BVZERO( &mods->sml_values[1] );
assert( !BER_BVISNULL( &mods->sml_values[0] ) ); assert( !BER_BVISNULL( &mods->sml_values[0] ) );
} else if (attr_find(e->e_attrs, ad_pwdChangedTime )) {
} else { mods = (Modifications *) ch_calloc( sizeof( Modifications ), 1 );
mods->sml_op = LDAP_MOD_DELETE; mods->sml_op = LDAP_MOD_DELETE;
} }
mods->sml_flags = SLAP_MOD_INTERNAL; if (mods) {
mods->sml_next = NULL; mods->sml_desc = ad_pwdChangedTime;
modtail->sml_next = mods; mods->sml_flags = SLAP_MOD_INTERNAL;
modtail = mods; mods->sml_next = NULL;
modtail->sml_next = mods;
modtail = mods;
}
if (attr_find(e->e_attrs, ad_pwdGraceUseTime )) { if (attr_find(e->e_attrs, ad_pwdGraceUseTime )) {
mods = (Modifications *) ch_calloc( sizeof( Modifications ), 1 ); mods = (Modifications *) ch_calloc( sizeof( Modifications ), 1 );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment