From 8b730300a2a769d54cb899047eec58a52fbdaefd Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Wed, 26 Jan 2005 03:30:22 +0000 Subject: [PATCH] Enable subordinate scope feature --- libraries/libldap/request.c | 2 +- libraries/libldap/url.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c index ed9c6f3e22..41caa7f7b5 100644 --- a/libraries/libldap/request.c +++ b/libraries/libldap/request.c @@ -1125,7 +1125,7 @@ re_encode_request( LDAP *ld, scope = LDAP_SCOPE_BASE; break; case LDAP_SCOPE_SUBTREE: -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: #endif scope = LDAP_SCOPE_SUBTREE; diff --git a/libraries/libldap/url.c b/libraries/libldap/url.c index 0f6379f443..b6a669fce9 100644 --- a/libraries/libldap/url.c +++ b/libraries/libldap/url.c @@ -509,7 +509,7 @@ desc2str_len( LDAPURLDesc *u ) case LDAP_SCOPE_BASE: case LDAP_SCOPE_ONELEVEL: case LDAP_SCOPE_SUBTREE: -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: #endif switch ( u->lud_scope ) { @@ -525,7 +525,7 @@ desc2str_len( LDAPURLDesc *u ) len += STRLENOF( "sub" ); break; -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: len += STRLENOF( "subordinate" ); break; @@ -597,7 +597,7 @@ desc2str( LDAPURLDesc *u, char *s, int len ) case LDAP_SCOPE_BASE: case LDAP_SCOPE_ONELEVEL: case LDAP_SCOPE_SUBTREE: -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: #endif gotscope = 1; @@ -690,7 +690,7 @@ desc2str( LDAPURLDesc *u, char *s, int len ) len -= STRLENOF("sub"); break; -#ifdef LDAP_FEATURE_SUBORDINATE_SCOPE +#ifdef LDAP_SCOPE_SUBORDINATE case LDAP_SCOPE_SUBORDINATE: strcpy( &s[sofar], "children" ); sofar += STRLENOF("children"); -- 2.39.5