mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let oc_check_allowed grok things like userCertificate;binary

Browse Source 
oc_check_required should be fixed too.
This commit is contained in:
Julio Sánchez Fernández 1999-09-17 15:51:44 +00:00
parent c7a7829c00
commit 0ab1eeae39
1 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
servers/slapd/schema.c
View File

@ -223,6 +223,7 @@ oc_check_allowed( char *type, struct berval **ocl )
AttributeType *at; AttributeType *at;
int i, j; int i, j;
char **pp; char **pp;
char *p, *t;
Debug( LDAP_DEBUG_TRACE, Debug( LDAP_DEBUG_TRACE,
"oc_check_allowed type \"%s\"\n", type, 0, 0 ); "oc_check_allowed type \"%s\"\n", type, 0, 0 );
@ -241,6 +242,23 @@ oc_check_allowed( char *type, struct berval **ocl )
return( 0 ); return( 0 );
} }
/*
* The "type" we have received is actually an AttributeDescription.
* Let's find out the corresponding type.
*/
p = strchr( type, ';' );
if ( p ) {
t = ch_malloc( p-type+1 );
strncpy( t, type, p-type );
t[p-type] = '\0';
Debug( LDAP_DEBUG_TRACE,
"oc_check_allowed type \"%s\" from \"%s\"\n",
t, type, 0 );
} else {
t = type;
}
/* check that the type appears as req or opt in at least one oc */ /* check that the type appears as req or opt in at least one oc */
for ( i = 0; ocl[i] != NULL; i++ ) { for ( i = 0; ocl[i] != NULL; i++ ) {
/* if we know about the oc */ /* if we know about the oc */
@ -250,14 +268,18 @@ oc_check_allowed( char *type, struct berval **ocl )
oc->soc_required[j] != NULL; j++ ) { oc->soc_required[j] != NULL; j++ ) {
at = oc->soc_required[j]; at = oc->soc_required[j];
if ( at->sat_oid && if ( at->sat_oid &&
strcmp(at->sat_oid, type ) == 0 ) { strcmp(at->sat_oid, t ) == 0 ) {
if ( t != type )
ldap_memfree( t );
return( 0 ); return( 0 );
} }
pp = at->sat_names; pp = at->sat_names;
if ( pp == NULL ) if ( pp == NULL )
continue; continue;
while ( *pp ) { while ( *pp ) {
if ( strcasecmp( *pp, type ) == 0 ) { if ( strcasecmp( *pp, t ) == 0 ) {
if ( t != type )
ldap_memfree( t );
return( 0 ); return( 0 );
} }
pp++; pp++;
@ -268,15 +290,19 @@ oc_check_allowed( char *type, struct berval **ocl )
oc->soc_allowed[j] != NULL; j++ ) { oc->soc_allowed[j] != NULL; j++ ) {
at = oc->soc_allowed[j]; at = oc->soc_allowed[j];
if ( at->sat_oid && if ( at->sat_oid &&
strcmp(at->sat_oid, type ) == 0 ) { strcmp( at->sat_oid, t ) == 0 ) {
if ( t != type )
ldap_memfree( t );
return( 0 ); return( 0 );
} }
pp = at->sat_names; pp = at->sat_names;
if ( pp == NULL ) if ( pp == NULL )
continue; continue;
while ( *pp ) { while ( *pp ) {
if ( strcasecmp( *pp, type ) == 0 || if ( strcasecmp( *pp, t ) == 0 ||
strcmp( *pp, "*" ) == 0 ) { strcmp( *pp, "*" ) == 0 ) {
if ( t != type )
ldap_memfree( t );
return( 0 ); return( 0 );
} }
pp++; pp++;
@ -286,10 +312,14 @@ oc_check_allowed( char *type, struct berval **ocl )
/* we don't know about the oc. assume it allows it */ /* we don't know about the oc. assume it allows it */
} else { } else {
if ( t != type )
ldap_memfree( t );
return( 0 ); return( 0 );
} }
} }
if ( t != type )
ldap_memfree( t );
/* not allowed by any oc */ /* not allowed by any oc */
return( 1 ); return( 1 );
} }