mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

s/SERVER_SEARCH_FLAG/SEARCH_FLAG

Browse Source
This commit is contained in:
Luke Howard 2004-03-09 14:12:34 +00:00
parent ad7bfa1c23
commit d249714033
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ldap.h
View File

@ -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 */

4
servers/slapd/controls.c
View File

@ -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;