ITS#4799 remove kbind references. (kind of moot, since slurpd

itself is also deprecated...)

diff --git a/servers/slurpd/args.c b/servers/slurpd/args.c
index 0a1662be85f490df42ff53bed1122e915a17f16c..c5685817efc9587dac665a5ad150da4c991c5d40 100644 (file)
--- a/servers/slurpd/args.c
+++ b/servers/slurpd/args.c
@@ -52,11 +52,7 @@ usage( char *name )
 {
     fprintf( stderr, "usage: %s\t[-d debug-level] [-s syslog-level]\n", name );
     fprintf( stderr, "\t\t[-f slapd-config-file] [-r replication-log-file]\n" );
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-    fprintf( stderr, "\t\t[-t tmp-dir] [-o] [-k srvtab-file]\n" );
-#else /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
     fprintf( stderr, "\t\t[-t tmp-dir] [-o]\n" );
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
     fprintf( stderr, "\t\t[-n service-name]\n" );
 }
 

diff --git a/servers/slurpd/config.c b/servers/slurpd/config.c
index dc0a996b27088bbd629ca2e4360d8e60e9aa7eee..5fe321de4782bce15c9ca5fb04849fe634077767 100644 (file)
--- a/servers/slurpd/config.c
+++ b/servers/slurpd/config.c
@@ -613,12 +613,7 @@ parse_replica_line(
        } else if ( !strncasecmp( cargv[ i ], BINDMETHSTR,
                sizeof( BINDMETHSTR ) - 1 ) ) {
            val = cargv[ i ] + sizeof( BINDMETHSTR );
-           if ( !strcasecmp( val, KERBEROSSTR )) {
-           fprintf( stderr, "Error: a bind method of \"kerberos\" was\n" );
-           fprintf( stderr, "specified in the slapd configuration file.\n" );
-           fprintf( stderr, "slurpd no longer supports Kerberos.\n" );
-           exit( EXIT_FAILURE );
-           } else if ( !strcasecmp( val, SIMPLESTR )) {
+           if ( !strcasecmp( val, SIMPLESTR )) {
                ri->ri_bind_method = LDAP_AUTH_SIMPLE;
                gots |= GOT_METHOD;
            } else if ( !strcasecmp( val, SASLSTR )) {

diff --git a/servers/slurpd/globals.c b/servers/slurpd/globals.c
index 44c07767ba623197875072e694bb1f5bfe81e266..80e2238f721c57dc78e59b7cac4187a07001b2f3 100644 (file)
--- a/servers/slurpd/globals.c
+++ b/servers/slurpd/globals.c
@@ -95,9 +95,6 @@ init_globals( void )
        fprintf( stderr, "Cannot initialize queue\n" );
        exit( EXIT_FAILURE );
     }
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-    g->default_srvtab = SRVTAB;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
 
     return g;
 }

diff --git a/servers/slurpd/globals.h b/servers/slurpd/globals.h
index 2c608ba2836ff2d3a8ba18526473bc0193b15123..28a960b9f9e50e0564f5b69601567795d46f6988 100644 (file)
--- a/servers/slurpd/globals.h
+++ b/servers/slurpd/globals.h
@@ -77,10 +77,6 @@ typedef struct globals {
     St *st;
     /* Pointer to replication queue */
     Rq *rq;
-#ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
-    /* Default name of kerberos srvtab file */
-    char *default_srvtab;
-#endif /* LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND */
     /* Non-zero if we shall print the version */
     int version;
 } Globals;

diff --git a/servers/slurpd/slurp.h b/servers/slurpd/slurp.h
index 7782b8b263c2c1839bf38bde9ce8b8c2bfb3c9a1..e80c848a0878d9e04ead1d4d0aaef2cc47eec151 100644 (file)
--- a/servers/slurpd/slurp.h
+++ b/servers/slurpd/slurp.h
@@ -156,7 +156,6 @@
 #define        SUFFIXSTR               "suffix"
 #define        BINDDNSTR               "binddn"
 #define        BINDMETHSTR             "bindmethod"
-#define        KERBEROSSTR             "kerberos"
 #define        SIMPLESTR               "simple"
 #define        SASLSTR                 "sasl"
 #define        CREDSTR                 "credentials"
@@ -179,7 +178,6 @@
 #define        BIND_ERR_OPEN                           2
 #define        BIND_ERR_BAD_ATYPE                      3
 #define        BIND_ERR_SIMPLE_FAILED          4
-#define        BIND_ERR_KERBEROS_FAILED        5
 #define        BIND_ERR_BADRI                          6
 #define        BIND_ERR_VERSION                        7
 #define        BIND_ERR_REFERRALS                      8
@@ -241,14 +239,13 @@ struct ri {
     char       *ri_uri;                /* e.g. "ldaps://ldap-1.example.com:636" */
     LDAP       *ri_ldp;                /* LDAP struct for this replica */
     int                ri_tls;                 /* TLS: 0=no, 1=yes, 2=critical */
-    int                ri_bind_method;         /* AUTH_SIMPLE or AUTH_KERBEROS */
+    int                ri_bind_method;         /* AUTH_SIMPLE or AUTH_SASL */
     char       *ri_bind_dn;            /* DN to bind as when replicating */
     char       *ri_password;           /* Password for any method */
     char       *ri_secprops;           /* SASL security properties */
     char       *ri_realm;                      /* realm for any mechanism */
     char       *ri_authcId;            /* authentication ID for any mechanism */
     char       *ri_authzId;            /* authorization ID for any mechanism */
-    char       *ri_srvtab;             /* srvtab file for kerberos bind */
     char       *ri_saslmech;           /* SASL mechanism to use */
     struct re  *ri_curr;               /* current repl entry being processed */
     struct stel        *ri_stel;               /* pointer to Stel for this replica */