From 71cf424b770cf6ca90c7a3eeee534354c0babd30 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 26 Nov 2005 06:35:36 +0000 Subject: [PATCH] unifdef -DLDAP_SCOPE_SUBORDINATE --- libraries/libldap/request.c | 2 -- libraries/libldap/url.c | 11 ----------- 2 files changed, 13 deletions(-) diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index 84dc5a8e14..0b9aa27da6 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -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; } diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c index 8fe30b911a..3365fbcd6d 100644 --- a/libraries/libldap/url.c +++ b/libraries/libldap/url.c @@ -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 ); -- 2.39.5