From: Howard Chu <hyc@openldap.org>
Date: Wed, 10 Jan 2007 00:19:24 +0000 (+0000)
Subject: ITS#4799 additional patches
X-Git-Tag: OPENLDAP_REL_ENG_2_4_4ALPHA~8^2~222
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15eb08e5624770717045835f33dd61e2b408b312;p=openldap

ITS#4799 additional patches
---

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 5fe321de47..949e3084e0 100644
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -652,13 +652,6 @@ parse_replica_line(
 			AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) {
 	    val = cargv[ i ] + sizeof( AUTHZSTR );
 	    ri->ri_authzId = strdup( val );
-	} else if ( !strncasecmp( cargv[ i ], 
-			SRVTABSTR, sizeof( SRVTABSTR ) - 1 ) ) {
-	    val = cargv[ i ] + sizeof( SRVTABSTR );
-	    if ( ri->ri_srvtab != NULL ) {
-		free( ri->ri_srvtab );
-	    }
-	    ri->ri_srvtab = strdup( val );
 	} else {
 	    fprintf( stderr, 
 		    "Error: parse_replica_line: unknown keyword \"%s\"\n",
diff --git a/servers/slurpd/ri.c b/servers/slurpd/ri.c
index 13875b6abb..62062cceb8 100644
--- a/servers/slurpd/ri.c
+++ b/servers/slurpd/ri.c
@@ -209,7 +209,6 @@ Ri_init(
     (*ri)->ri_bind_dn = NULL;
     (*ri)->ri_password = NULL;
     (*ri)->ri_authcId = NULL;
-    (*ri)->ri_srvtab = NULL;
     (*ri)->ri_curr = NULL;
 
     return 0;
diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index e80c848a08..9a125c63f7 100644
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -162,7 +162,6 @@
 #define	OLDAUTHCSTR		"bindprincipal"
 #define	AUTHCSTR		"authcID"
 #define	AUTHZSTR		"authzID"
-#define	SRVTABSTR		"srvtab"
 #define	SASLMECHSTR		"saslmech"
 #define	REALMSTR		"realm"
 #define	SECPROPSSTR		"secprops"