Enable subordinate scope feature

diff --git a/libraries/libldap/request.c b/libraries/libldap/request.c
index ed9c6f3e22fdafbe4bb01bb4f6adc7a5c6cd9526..41caa7f7b5372caf5ec7ddc61b23bf4b4cee3db3 100644 (file)
--- 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 0f6379f443ebe538b22ce05f352af0594cc3aec0..b6a669fce90d32464f12d67575848f0c0620a92f 100644 (file)
--- 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");