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

Hide subtree delete control

Browse Source
This commit is contained in:
Kurt Zeilenga 2005-01-20 17:54:04 +00:00
parent 521100db56
commit 64668f7207
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
servers/slapd/controls.c
View File

@ -37,10 +37,7 @@ static SLAP_CTRL_PARSE_FN parsePermissiveModify;
static SLAP_CTRL_PARSE_FN parseDomainScope; static SLAP_CTRL_PARSE_FN parseDomainScope;
static SLAP_CTRL_PARSE_FN parseTreeDelete; static SLAP_CTRL_PARSE_FN parseTreeDelete;
static SLAP_CTRL_PARSE_FN parseSearchOptions; static SLAP_CTRL_PARSE_FN parseSearchOptions;
#ifdef LDAP_CONTROL_SUBENTRIES
static SLAP_CTRL_PARSE_FN parseSubentries; static SLAP_CTRL_PARSE_FN parseSubentries;
#endif
#undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */ #undef sc_mask /* avoid conflict with Irix 6.5 <sys/signal.h> */
@ -127,10 +124,10 @@ static struct slap_control control_defs[] = {
SLAP_CTRL_MODIFY, NULL, SLAP_CTRL_MODIFY, NULL,
parsePermissiveModify, LDAP_SLIST_ENTRY_INITIALIZER(next) }, parsePermissiveModify, LDAP_SLIST_ENTRY_INITIALIZER(next) },
#endif #endif
#ifdef LDAP_CONTROL_X_TREE_DELETE #ifdef SLAP_CONTROL_X_TREE_DELETE
{ LDAP_CONTROL_X_TREE_DELETE, { LDAP_CONTROL_X_TREE_DELETE,
(int)offsetof(struct slap_control_ids, sc_treeDelete), (int)offsetof(struct slap_control_ids, sc_treeDelete),
SLAP_CTRL_DELETE, NULL, SLAP_CTRL_HIDE|SLAP_CTRL_DELETE, NULL,
parseTreeDelete, LDAP_SLIST_ENTRY_INITIALIZER(next) }, parseTreeDelete, LDAP_SLIST_ENTRY_INITIALIZER(next) },
#endif #endif
#ifdef LDAP_CONTORL_X_SEARCH_OPTIONS #ifdef LDAP_CONTORL_X_SEARCH_OPTIONS
@ -1306,7 +1303,10 @@ static int parseSearchOptions (
} }
if ( search_flags & ~(LDAP_SEARCH_FLAG_DOMAIN_SCOPE) ) { if ( search_flags & ~(LDAP_SEARCH_FLAG_DOMAIN_SCOPE) ) {
/* Other search flags not recognised so far */ /* Other search flags not recognised so far,
* including:
* LDAP_SEARCH_FLAG_PHANTOM_ROOM
*/
rs->sr_text = "searchOptions contained unrecongized flag"; rs->sr_text = "searchOptions contained unrecongized flag";
return LDAP_UNWILLING_TO_PERFORM; return LDAP_UNWILLING_TO_PERFORM;
} }

3
servers/slapd/slap.h
View File

@ -64,7 +64,8 @@ LDAP_BEGIN_DECL
#define LDAP_COMP_MATCH /* experimental */ #define LDAP_COMP_MATCH /* experimental */
#define LDAP_DYNAMIC_OBJECTS #define LDAP_DYNAMIC_OBJECTS
#define LDAP_SYNC_TIMESTAMP #define LDAP_SYNC_TIMESTAMP
#define LDAP_COLLECTIVE_ATTRIBUTES /* not yet implemented */ #define LDAP_COLLECTIVE_ATTRIBUTES
#define SLAP_CONTROL_X_TREE_DELETE LDAP_CONTROL_X_TREE_DELETE
#endif #endif
#if defined(LDAP_DEVEL) && defined(ENABLE_REWRITE) #if defined(LDAP_DEVEL) && defined(ENABLE_REWRITE)