mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-29 19:19:35 -05:00
LDAP_SCOPE SUBORDINATE implementation
This commit is contained in:
parent
c7f1759e80
commit
afb520a6e9
2 changed files with 8 additions and 0 deletions
|
|
@ -1229,7 +1229,9 @@ re_encode_request( LDAP *ld,
|
|||
scope = LDAP_SCOPE_BASE;
|
||||
break;
|
||||
case LDAP_SCOPE_SUBTREE:
|
||||
#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
|
||||
case LDAP_SCOPE_SUBORDINATE:
|
||||
#endif
|
||||
scope = LDAP_SCOPE_SUBTREE;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -246,11 +246,13 @@ static int str2scope( const char *p )
|
|||
} else if ( strcasecmp( p, "subtree" ) == 0 ) {
|
||||
return LDAP_SCOPE_SUBTREE;
|
||||
|
||||
#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
|
||||
} else if ( strcasecmp( p, "subordinate" ) == 0 ) {
|
||||
return LDAP_SCOPE_SUBORDINATE;
|
||||
|
||||
} else if ( strcasecmp( p, "children" ) == 0 ) {
|
||||
return LDAP_SCOPE_SUBORDINATE;
|
||||
#endif
|
||||
}
|
||||
|
||||
return( -1 );
|
||||
|
|
@ -350,7 +352,9 @@ char * ldap_url_desc2str( LDAPURLDesc *u )
|
|||
case LDAP_SCOPE_BASE:
|
||||
case LDAP_SCOPE_ONELEVEL:
|
||||
case LDAP_SCOPE_SUBTREE:
|
||||
#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
|
||||
case LDAP_SCOPE_SUBORDINATE:
|
||||
#endif
|
||||
len += sizeof("subordinate");
|
||||
if( !sep ) sep = 3;
|
||||
break;
|
||||
|
|
@ -420,10 +424,12 @@ char * ldap_url_desc2str( LDAPURLDesc *u )
|
|||
strcpy( &s[sofar], "sub" );
|
||||
sofar += sizeof("sub") - 1;
|
||||
break;
|
||||
#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE
|
||||
case LDAP_SCOPE_SUBORDINATE:
|
||||
strcpy( &s[sofar], "children" );
|
||||
sofar += sizeof("children") - 1;
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
if( sep < 4 ) goto done;
|
||||
|
|
|
|||
Loading…
Reference in a new issue