mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Kurt Zeilenga 2003-10-15 03:08:43 +00:00
parent 9d59b5a41c
commit f1e5201bf7
3 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
servers/slurpd/config.c
View File

@ -523,10 +523,10 @@ parse_replica_line(
fprintf( stderr, "slurpd no longer supports Kerberos.\n" ); fprintf( stderr, "slurpd no longer supports Kerberos.\n" );
exit( EXIT_FAILURE ); exit( EXIT_FAILURE );
} else if ( !strcasecmp( val, SIMPLESTR )) { } else if ( !strcasecmp( val, SIMPLESTR )) {
ri->ri_bind_method = AUTH_SIMPLE; ri->ri_bind_method = LDAP_AUTH_SIMPLE;
gots |= GOT_METHOD; gots |= GOT_METHOD;
} else if ( !strcasecmp( val, SASLSTR )) { } else if ( !strcasecmp( val, SASLSTR )) {
ri->ri_bind_method = AUTH_SASL; ri->ri_bind_method = LDAP_AUTH_SASL;
gots |= GOT_METHOD; gots |= GOT_METHOD;
} else { } else {
ri->ri_bind_method = -1; 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) { if ((gots & GOT_MECH) == 0) {
fprintf( stderr, "Error: \"replica\" line needs SASLmech flag in " ); fprintf( stderr, "Error: \"replica\" line needs SASLmech flag in " );
fprintf( stderr, "slapd config file, line %d\n", lineno ); fprintf( stderr, "slapd config file, line %d\n", lineno );
return -1; return -1;
} }
} } else if ( gots != GOT_ALL ) {
else if ( gots != GOT_ALL ) {
fprintf( stderr, "Error: Malformed \"replica\" line in slapd " ); fprintf( stderr, "Error: Malformed \"replica\" line in slapd " );
fprintf( stderr, "config file, line %d\n", lineno ); fprintf( stderr, "config file, line %d\n", lineno );
return -1; return -1;

4
servers/slurpd/ldap_op.c
View File

@ -913,7 +913,7 @@ retry:
} }
switch ( ri->ri_bind_method ) { switch ( ri->ri_bind_method ) {
case AUTH_SIMPLE: case LDAP_AUTH_SIMPLE:
/* /*
* Bind with a plaintext password. * Bind with a plaintext password.
*/ */
@ -944,7 +944,7 @@ retry:
} }
break; break;
case AUTH_SASL: case LDAP_AUTH_SASL:
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ARGS, LDAP_LOG ( OPERATION, ARGS,
"do_bind: bind to %s as %s via %s (SASL)\n", "do_bind: bind to %s as %s via %s (SASL)\n",

8
servers/slurpd/slurp.h
View File

@ -65,9 +65,6 @@
/* slurpd dump file - contents of rq struct are written here (debugging) */ /* slurpd dump file - contents of rq struct are written here (debugging) */
#define SLURPD_DUMPFILE LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump" #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 */ /* Amount of time to sleep if no more work to do */
#define DEFAULT_NO_WORK_INTERVAL 3 #define DEFAULT_NO_WORK_INTERVAL 3
@ -85,11 +82,6 @@
#define TLS_ON 1 #define TLS_ON 1
#define TLS_CRITICAL 2 #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 */ /* Rejection records are prefaced with this string */
#define ERROR_STR "ERROR" #define ERROR_STR "ERROR"