upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-16 11:57:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Complete the replacement of LDAP_CONTROL_X_TREE_DELETE with

Browse source 
SLAP_CONTROL_X_TREE_DELETE, which is only defiend when LDAP_DEVEL.
back-sql triggered an assert(0): It expected the control to be supported.
This commit is contained in:
Hallvard Furuseth 2005-07-07 20:36:37 +00:00
parent d518a76b35
commit b1f5e9258a
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/back-sql/init.c
View file

@ -39,9 +39,9 @@ sql_back_initialize(
#if 0 /* needs improvements */
LDAP_CONTROL_NOOP,
#endif
#ifdef LDAP_CONTROL_X_TREE_DELETE
LDAP_CONTROL_X_TREE_DELETE,
#endif /* LDAP_CONTROL_X_TREE_DELETE */
#ifdef SLAP_CONTROL_X_TREE_DELETE
SLAP_CONTROL_X_TREE_DELETE,
#endif /* SLAP_CONTROL_X_TREE_DELETE */
NULL
};

4
servers/slapd/controls.c
View file

@ -41,7 +41,9 @@ static SLAP_CTRL_PARSE_FN parseSortedResults;
static SLAP_CTRL_PARSE_FN parseValuesReturnFilter;
static SLAP_CTRL_PARSE_FN parsePermissiveModify;
static SLAP_CTRL_PARSE_FN parseDomainScope;
#ifdef SLAP_CONTROL_X_TREE_DELETE
static SLAP_CTRL_PARSE_FN parseTreeDelete;
#endif
static SLAP_CTRL_PARSE_FN parseSearchOptions;
static SLAP_CTRL_PARSE_FN parseSubentries;
@ -1325,7 +1327,7 @@ static int parseDomainScope (
}
#endif
#ifdef LDAP_CONTROL_X_TREE_DELETE
#ifdef SLAP_CONTROL_X_TREE_DELETE
static int parseTreeDelete (
Operation *op,
SlapReply *rs,

2
servers/slapd/slap.h
View file

@ -2429,7 +2429,7 @@ typedef struct slap_op {
#define get_domainScope(op) (0)
#endif
#ifdef LDAP_CONTROL_X_TREE_DELETE
#ifdef SLAP_CONTROL_X_TREE_DELETE
#define o_tree_delete o_ctrlflag[slap_cids.sc_treeDelete]
#define get_treeDelete(op) ((int)(op)->o_tree_delete)
#else