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

Password policy request control should have no control value.

Browse source 
Extend ldap_create_control() to supporting creating such.
This commit is contained in:
Kurt Zeilenga 2007-08-22 19:26:55 +00:00
parent 57316ae1ac
commit e6699ce023
2 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libldap/controls.c
View file

@ -427,7 +427,6 @@ ldap_create_control(
LDAPControl *ctrl; LDAPControl *ctrl;
assert( requestOID != NULL ); assert( requestOID != NULL );
assert( ber != NULL );
assert( ctrlp != NULL ); assert( ctrlp != NULL );
ctrl = (LDAPControl *) LDAP_MALLOC( sizeof(LDAPControl) ); ctrl = (LDAPControl *) LDAP_MALLOC( sizeof(LDAPControl) );
@ -435,7 +434,8 @@ ldap_create_control(
return LDAP_NO_MEMORY; return LDAP_NO_MEMORY;
} }
if ( ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 ) { ctrl->ldctl_value = NULL;
if ( ber && ( ber_flatten2( ber, &ctrl->ldctl_value, 1 ) == -1 )) {
LDAP_FREE( ctrl ); LDAP_FREE( ctrl );
return LDAP_NO_MEMORY; return LDAP_NO_MEMORY;
} }

10
libraries/libldap/ppolicy.c
View file

@ -61,21 +61,13 @@ int
ldap_create_passwordpolicy_control( LDAP *ld, ldap_create_passwordpolicy_control( LDAP *ld,
LDAPControl **ctrlp ) LDAPControl **ctrlp )
{ {
BerElement *ber;
assert( ld != NULL ); assert( ld != NULL );
assert( LDAP_VALID( ld ) ); assert( LDAP_VALID( ld ) );
assert( ctrlp != NULL ); 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, ld->ld_errno = ldap_create_control( LDAP_CONTROL_PASSWORDPOLICYREQUEST,
ber, 0, ctrlp); NULL, 0, ctrlp);
ber_free(ber, 1);
return(ld->ld_errno); return(ld->ld_errno);
} }