ITS#4799 additional patches

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index 5fe321de4782bce15c9ca5fb04849fe634077767..949e3084e09713652bf34953c45e5c194569eab4 100644 (file)
--- 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 13875b6abb3f851f9239c046a9774dda6e0fa45c..62062cceb8a7562084cab3373bd96a148d63d3cd 100644 (file)
--- 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 e80c848a0878d9e04ead1d4d0aaef2cc47eec151..9a125c63f71f80a2ffeeb7399c8c20bd6c1825d6 100644 (file)
--- 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"