mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Deleted subordinate keyword in favor of glue overlay

Browse Source
This commit is contained in:
Howard Chu 2004-12-04 20:08:56 +00:00
parent 2f48a47194
commit dfb8c86dc3
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/slapd/config.c
View File

@ -56,7 +56,6 @@ char *ldap_srvtab = "";
char **default_passwd_hash = NULL; char **default_passwd_hash = NULL;
struct berval default_search_base = BER_BVNULL; struct berval default_search_base = BER_BVNULL;
struct berval default_search_nbase = BER_BVNULL; struct berval default_search_nbase = BER_BVNULL;
unsigned num_subordinates = 0;
ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT; ber_len_t sockbuf_max_incoming = SLAP_SB_MAX_INCOMING_DEFAULT;
ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH; ber_len_t sockbuf_max_incoming_auth= SLAP_SB_MAX_INCOMING_AUTH;
@ -140,7 +139,6 @@ enum {
CFG_SALT, CFG_SALT,
CFG_LIMITS, CFG_LIMITS,
CFG_RO, CFG_RO,
CFG_SUB,
CFG_SASLOPT, CFG_SASLOPT,
CFG_REWRITE, CFG_REWRITE,
CFG_DEPTH, CFG_DEPTH,
@ -192,7 +190,6 @@ ConfigTable SystemConfiguration[] = {
{ "sizelimit", 2, 2, 0, "limit", ARG_MAGIC|CFG_SIZE, &config_sizelimit, NULL, NULL, NULL }, { "sizelimit", 2, 2, 0, "limit", ARG_MAGIC|CFG_SIZE, &config_sizelimit, NULL, NULL, NULL },
{ "timelimit", 2, 2, 0, "limit", ARG_MAGIC|CFG_TIME, &config_timelimit, NULL, NULL, NULL }, { "timelimit", 2, 2, 0, "limit", ARG_MAGIC|CFG_TIME, &config_timelimit, NULL, NULL, NULL },
{ "limits", 2, 2, 0, "limits", ARG_DB|ARG_MAGIC|CFG_LIMITS, &config_generic, NULL, NULL, NULL }, { "limits", 2, 2, 0, "limits", ARG_DB|ARG_MAGIC|CFG_LIMITS, &config_generic, NULL, NULL, NULL },
{ "subordinate", 1, 1, 0, "sub", ARG_DB|ARG_MAGIC|CFG_SUB, &config_generic, NULL, NULL, NULL },
{ "overlay", 2, 2, 0, "overlay", ARG_DB|ARG_MAGIC, &config_overlay, NULL, NULL, NULL }, { "overlay", 2, 2, 0, "overlay", ARG_DB|ARG_MAGIC, &config_overlay, NULL, NULL, NULL },
{ "suffix", 2, 2, 0, "suffix", ARG_DB|ARG_MAGIC, &config_suffix, NULL, NULL, NULL }, { "suffix", 2, 2, 0, "suffix", ARG_DB|ARG_MAGIC, &config_suffix, NULL, NULL, NULL },
{ "maxDerefDepth", 2, 2, 0, "depth", ARG_DB|ARG_INT|ARG_MAGIC|CFG_DEPTH, &config_generic, NULL, NULL, NULL }, { "maxDerefDepth", 2, 2, 0, "depth", ARG_DB|ARG_INT|ARG_MAGIC|CFG_DEPTH, &config_generic, NULL, NULL, NULL },
@ -573,11 +570,6 @@ config_generic(ConfigArgs *c) {
c->be->be_restrictops &= ~SLAP_RESTRICT_OP_WRITES; c->be->be_restrictops &= ~SLAP_RESTRICT_OP_WRITES;
break; break;
case CFG_SUB:
SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_GLUE_SUBORDINATE;
num_subordinates++;
break;
case CFG_SASLOPT: case CFG_SASLOPT:
/* XXX slap_sasl_config doesn't actually use the line argument */ /* XXX slap_sasl_config doesn't actually use the line argument */
if(slap_sasl_config(c->argc, c->argv, c->line, c->fname, c->lineno)) if(slap_sasl_config(c->argc, c->argv, c->line, c->fname, c->lineno))

2
servers/slapd/proto-slap.h
View File

@ -1334,8 +1334,6 @@ LDAP_SLAPD_F (int) value_add_one LDAP_P((
/* /*
* Other... * Other...
*/ */
LDAP_SLAPD_V(unsigned) num_subordinates;
LDAP_SLAPD_V (unsigned int) index_substr_if_minlen; LDAP_SLAPD_V (unsigned int) index_substr_if_minlen;
LDAP_SLAPD_V (unsigned int) index_substr_if_maxlen; LDAP_SLAPD_V (unsigned int) index_substr_if_maxlen;
LDAP_SLAPD_V (unsigned int) index_substr_any_len; LDAP_SLAPD_V (unsigned int) index_substr_any_len;