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

Now that we have a fixed number of slots for controls, don't bother

Browse source 
realloc'ing slap_known_controls.
This commit is contained in:
Howard Chu 2004-11-23 14:42:04 +00:00
parent 155387428a
commit 6bbca5e368
1 changed files with 11 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
servers/slapd/controls.c
View file

@ -75,7 +75,7 @@ static LDAP_SLIST_HEAD(ControlsList, slap_control) controls_list
/*
* all known request control OIDs should be added to this list
*/
char **slap_known_controls = NULL;
char *slap_known_controls[SLAP_MAX_CIDS+1];
static int num_known_controls;
static char *proxy_authz_extops[] = {
@ -175,6 +175,13 @@ register_supported_control(const char *controloid,
{
struct slap_control *sc;
if ( num_known_controls >= SLAP_MAX_CIDS ) {
Debug( LDAP_DEBUG_ANY, "Too many controls registered."
" Recompile slapd with SLAP_MAX_CIDS defined > %d\n",
SLAP_MAX_CIDS, 0, 0 );
return LDAP_OTHER;
}
if ( controloid == NULL ) return LDAP_PARAM_ERROR;
sc = (struct slap_control *)SLAP_MALLOC( sizeof( *sc ) );
@ -193,35 +200,11 @@ register_supported_control(const char *controloid,
}
sc->sc_parse = controlparsefn;
/* Update slap_known_controls, too. */
if ( slap_known_controls == NULL ) {
slap_known_controls = (char **)SLAP_MALLOC( 2 * sizeof(char *) );
if ( slap_known_controls == NULL ) {
if ( sc->sc_extendedops != NULL ) {
ldap_charray_free( sc->sc_extendedops );
}
ch_free( sc );
return LDAP_NO_MEMORY;
}
} else {
char **new_known_controls;
new_known_controls = (char **)SLAP_REALLOC(
slap_known_controls, (num_known_controls + 2) * sizeof(char *) );
if ( new_known_controls == NULL ) {
if ( sc->sc_extendedops != NULL ) {
ldap_charray_free( sc->sc_extendedops );
}
ch_free( sc );
return LDAP_NO_MEMORY;
}
slap_known_controls = new_known_controls;
}
if ( controlcid ) *controlcid = num_known_controls;
sc->sc_cid = num_known_controls;
slap_known_controls[num_known_controls++] = ch_strdup( sc->sc_oid );
/* Update slap_known_controls, too. */
slap_known_controls[num_known_controls++] = sc->sc_oid;
slap_known_controls[num_known_controls] = NULL;
LDAP_SLIST_NEXT( sc, sc_next ) = NULL;
@ -269,7 +252,6 @@ controls_destroy( void )
}
ch_free( sc );
}
ldap_charray_free( slap_known_controls );
}
/*