Commit 161bb56b authored by Pierangelo Masarati's avatar Pierangelo Masarati
Browse files

import fix to ITS#5103

parent 62768f4b
OpenLDAP 2.3 Change Log
OpenLDAP 2.3.39 Engineering
Fixed libldap ppolicy control creation (ITS#5103)
Documentation
Document slapd-sql workaround to ITS#4785
Added slapd-sql empty oc mapping workaround (ITS#4785)
OpenLDAP 2.3.38 Release (2007/08/20)
Fixed slapadd check for ';binary' when required (ITS#5071)
......
......@@ -442,7 +442,8 @@ ldap_create_control(
return LDAP_NO_MEMORY;
}
if ( ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 ) {
BER_BVZERO( &ctrl->ldctl_value );
if ( ber != NULL && ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 ) {
LDAP_FREE( ctrl );
return LDAP_NO_MEMORY;
}
......
......@@ -61,21 +61,13 @@ int
ldap_create_passwordpolicy_control( LDAP *ld,
LDAPControl **ctrlp )
{
BerElement *ber;
assert( ld != NULL );
assert( LDAP_VALID( ld ) );
assert( ctrlp != NULL );
if ((ber = ldap_alloc_ber_with_options(ld)) == NULL) {
ld->ld_errno = LDAP_NO_MEMORY;
return(LDAP_NO_MEMORY);
}
ld->ld_errno = ldap_create_control( LDAP_CONTROL_PASSWORDPOLICYREQUEST,
ber, 0, ctrlp);
NULL, 0, ctrlp);
ber_free(ber, 1);
return(ld->ld_errno);
}
......
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