From: Howard Chu <hyc@openldap.org>
Date: Sat, 4 Dec 2004 20:08:56 +0000 (+0000)
Subject: Deleted subordinate keyword in favor of glue overlay
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~135
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=dfb8c86dc3e5f4dce3b8ef0ca2ac1518f18cb40c;p=openldap

Deleted subordinate keyword in favor of glue overlay
---

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 75976a0337..493d4bd213 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -56,7 +56,6 @@ char		*ldap_srvtab = "";
 char		**default_passwd_hash = NULL;
 struct berval default_search_base = 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_auth= SLAP_SB_MAX_INCOMING_AUTH;
@@ -140,7 +139,6 @@ enum {
 	CFG_SALT,
 	CFG_LIMITS,
 	CFG_RO,
-	CFG_SUB,
 	CFG_SASLOPT,
 	CFG_REWRITE,
 	CFG_DEPTH,
@@ -192,7 +190,6 @@ ConfigTable SystemConfiguration[] = {
   { "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 },
   { "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 },
   { "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 },
@@ -573,11 +570,6 @@ config_generic(ConfigArgs *c) {
 				c->be->be_restrictops &= ~SLAP_RESTRICT_OP_WRITES;
 			break;
 
-		case CFG_SUB:
-			SLAP_DBFLAGS(c->be) |= SLAP_DBFLAG_GLUE_SUBORDINATE;
-			num_subordinates++;
-			break;
-
 		case CFG_SASLOPT:
 			/* 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))
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index bfcafdc105..219c4f1011 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -1334,8 +1334,6 @@ LDAP_SLAPD_F (int) value_add_one LDAP_P((
 /*
  * Other...
  */
-LDAP_SLAPD_V(unsigned) num_subordinates;
-
 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_any_len;