s/SERVER_SEARCH_FLAG/SEARCH_FLAG

diff --git a/include/ldap.h b/include/ldap.h
index 841f62cfad2ae8e8a5d1b83fc05dd302d6f84fb7..0efd99e7210d1d77c2b386020a4cb21f5d26877f 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -244,8 +244,8 @@ typedef struct ldapcontrol {
 #define LDAP_CONTROL_X_INCREMENTAL_VALUES      "1.2.840.113556.1.4.802"
 #define LDAP_CONTROL_X_TREE_DELETE             "1.2.840.113556.1.4.805"
 #define LDAP_CONTROL_X_SEARCH_OPTIONS          "1.2.840.113556.1.4.1340"
-#define LDAP_SERVER_SEARCH_FLAG_DOMAIN_SCOPE   1 /* do not generate referrals */
-#define LDAP_SERVER_SEARCH_FLAG_PHANTOM_ROOT   2 /* search all NCs subordinate to base */
+#define LDAP_SEARCH_FLAG_DOMAIN_SCOPE          1 /* do not generate referrals */
+#define LDAP_SEARCH_FLAG_PHANTOM_ROOT          2 /* search all NCs subordinate to base */
 
 /* not implemented in slapd(8) */
 #define LDAP_CONTROL_SORTREQUEST    "1.2.840.113556.1.4.473" /* RFC 2891 */

diff --git a/servers/slapd/controls.c b/servers/slapd/controls.c
index 1ddc6fec3f5f0f5c48ec44257abfef79aa353bf8..7818eab0745d7143806d9a03918fc71e5fc24def 100644 (file)
--- a/servers/slapd/controls.c
+++ b/servers/slapd/controls.c
@@ -1278,7 +1278,7 @@ static int parseSearchOptions (
 
        (void) ber_free( ber, 1 );
 
-       if ( search_flags & LDAP_SERVER_SEARCH_FLAG_DOMAIN_SCOPE ) {
+       if ( search_flags & LDAP_SEARCH_FLAG_DOMAIN_SCOPE ) {
                if ( op->o_domain_scope != SLAP_NO_CONTROL ) {
                        rs->sr_text = "searchOptions control specified multiple times or with domainScope control";
                        return LDAP_PROTOCOL_ERROR;
@@ -1289,7 +1289,7 @@ static int parseSearchOptions (
                        : SLAP_NONCRITICAL_CONTROL;
        }
 
-       if ( search_flags & ~(LDAP_SERVER_SEARCH_FLAG_DOMAIN_SCOPE) ) {
+       if ( search_flags & ~(LDAP_SEARCH_FLAG_DOMAIN_SCOPE) ) {
                /* Other search flags not recognised so far */
                rs->sr_text = "searchOptions contained invalid flag";
                return LDAP_UNAVAILABLE_CRITICAL_EXTENSION;