Commit f1e5201b authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

cleanup

parent 9d59b5a4
......@@ -523,10 +523,10 @@ parse_replica_line(
fprintf( stderr, "slurpd no longer supports Kerberos.\n" );
exit( EXIT_FAILURE );
} else if ( !strcasecmp( val, SIMPLESTR )) {
ri->ri_bind_method = AUTH_SIMPLE;
ri->ri_bind_method = LDAP_AUTH_SIMPLE;
gots |= GOT_METHOD;
} else if ( !strcasecmp( val, SASLSTR )) {
ri->ri_bind_method = AUTH_SASL;
ri->ri_bind_method = LDAP_AUTH_SASL;
gots |= GOT_METHOD;
} else {
ri->ri_bind_method = -1;
......@@ -575,14 +575,13 @@ parse_replica_line(
}
}
if ( ri->ri_bind_method == AUTH_SASL) {
if ( ri->ri_bind_method == LDAP_AUTH_SASL) {
if ((gots & GOT_MECH) == 0) {
fprintf( stderr, "Error: \"replica\" line needs SASLmech flag in " );
fprintf( stderr, "slapd config file, line %d\n", lineno );
return -1;
}
}
else if ( gots != GOT_ALL ) {
} else if ( gots != GOT_ALL ) {
fprintf( stderr, "Error: Malformed \"replica\" line in slapd " );
fprintf( stderr, "config file, line %d\n", lineno );
return -1;
......
......@@ -913,7 +913,7 @@ retry:
}
switch ( ri->ri_bind_method ) {
case AUTH_SIMPLE:
case LDAP_AUTH_SIMPLE:
/*
* Bind with a plaintext password.
*/
......@@ -944,7 +944,7 @@ retry:
}
break;
case AUTH_SASL:
case LDAP_AUTH_SASL:
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ARGS,
"do_bind: bind to %s as %s via %s (SASL)\n",
......
......@@ -65,9 +65,6 @@
/* slurpd dump file - contents of rq struct are written here (debugging) */
#define SLURPD_DUMPFILE LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump"
/* default srvtab file. Can be overridden */
#define SRVTAB "/etc/srvtab"
/* Amount of time to sleep if no more work to do */
#define DEFAULT_NO_WORK_INTERVAL 3
......@@ -85,11 +82,6 @@
#define TLS_ON 1
#define TLS_CRITICAL 2
/* We support simple (plaintext password) and SASL authentication */
#define AUTH_SIMPLE 1
#define AUTH_KERBEROS 2
#define AUTH_SASL 3
/* Rejection records are prefaced with this string */
#define ERROR_STR "ERROR"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment