From: Luke Howard <lukeh@openldap.org>
Date: Tue, 9 Mar 2004 14:12:34 +0000 (+0000)
Subject: s/SERVER_SEARCH_FLAG/SEARCH_FLAG
X-Git-Tag: OPENLDAP_REL_ENG_2_2_BP~335
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d249714033310776accc209322252f4b77731949;p=openldap

s/SERVER_SEARCH_FLAG/SEARCH_FLAG
---

diff --git a/include/ldap.h b/include/ldap.h
index 841f62cfad..0efd99e721 100644
--- 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 1ddc6fec3f..7818eab074 100644
--- 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;