upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 22:50:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

unifdef -DLDAP_SCOPE_SUBORDINATE

Browse source
This commit is contained in:
Kurt Zeilenga 2005-11-26 06:35:36 +00:00
parent a525a24eb5
commit 71cf424b77
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/libldap/request.c
View file

@ -1300,9 +1300,7 @@ re_encode_request( LDAP *ld,
scope = LDAP_SCOPE_BASE;
break;
case LDAP_SCOPE_SUBTREE:
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
#endif
scope = LDAP_SCOPE_SUBTREE;
break;
}

11
libraries/libldap/url.c
View file

@ -275,13 +275,11 @@ static int str2scope( const char *p )
} else if ( strcasecmp( p, "subtree" ) == 0 ) {
return LDAP_SCOPE_SUBTREE;
#ifdef LDAP_SCOPE_SUBORDINATE
} else if ( strcasecmp( p, "subordinate" ) == 0 ) {
return LDAP_SCOPE_SUBORDINATE;
} else if ( strcasecmp( p, "children" ) == 0 ) {
return LDAP_SCOPE_SUBORDINATE;
#endif
}
return( -1 );
@ -509,9 +507,7 @@ desc2str_len( LDAPURLDesc *u )
case LDAP_SCOPE_BASE:
case LDAP_SCOPE_ONELEVEL:
case LDAP_SCOPE_SUBTREE:
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
#endif
switch ( u->lud_scope ) {
case LDAP_SCOPE_BASE:
len += STRLENOF( "base" );
@ -525,12 +521,9 @@ desc2str_len( LDAPURLDesc *u )
len += STRLENOF( "sub" );
break;
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
len += STRLENOF( "subordinate" );
break;
#endif
}
if ( !sep ) {
@ -597,9 +590,7 @@ desc2str( LDAPURLDesc *u, char *s, int len )
case LDAP_SCOPE_BASE:
case LDAP_SCOPE_ONELEVEL:
case LDAP_SCOPE_SUBTREE:
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
#endif
gotscope = 1;
break;
}
@ -690,13 +681,11 @@ desc2str( LDAPURLDesc *u, char *s, int len )
len -= STRLENOF("sub");
break;
#ifdef LDAP_SCOPE_SUBORDINATE
case LDAP_SCOPE_SUBORDINATE:
strcpy( &s[sofar], "children" );
sofar += STRLENOF("children");
len -= STRLENOF("children");
break;
#endif
}
assert( len >= 0 );