From e9133952fb879aec1960f2244bffdfad2a74e683 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 18 Dec 2003 20:01:47 +0000 Subject: [PATCH] Move experimental built-in SASL behind SLAP_BUILTIN_SASL macro --- servers/slapd/connection.c | 2 +- servers/slapd/sasl.c | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 89233912eb..d2883e1fd4 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -1169,7 +1169,7 @@ int connection_client_setup( { Connection *c; - if ( connection_init( s, l, "", "", CONN_IS_CLIENT, 0, "" ) < 0 ) { + if ( connection_init( s, l, "", "", CONN_IS_CLIENT, 0, NULL ) < 0 ) { return -1; } diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c index 9021c9505f..60e9db716d 100644 --- a/servers/slapd/sasl.c +++ b/servers/slapd/sasl.c @@ -48,7 +48,7 @@ (SASL_VERSION_MINOR << 8) | SASL_VERSION_STEP) static sasl_security_properties_t sasl_secprops; -#else +#elif defined( SLAP_BUILTIN_SASL ) /* * built-in SASL implementation * only supports EXTERNAL @@ -1339,7 +1339,7 @@ int slap_sasl_open( Connection *conn, int reopen ) sc = slap_sasl_err2ldap( sc ); -#else +#elif defined(SLAP_BUILTIN_SASL) /* built-in SASL implementation */ SASL_CTX *ctx = (SASL_CTX *) SLAP_MALLOC(sizeof(SASL_CTX)); if( ctx == NULL ) return -1; @@ -1399,7 +1399,7 @@ int slap_sasl_external( if ( sc != SASL_OK ) { return LDAP_OTHER; } -#else +#elif defined(SLAP_BUILTIN_SASL) /* built-in SASL implementation */ SASL_CTX *ctx = conn->c_sasl_authctx; if ( ctx == NULL ) return LDAP_UNAVAILABLE; @@ -1458,7 +1458,7 @@ char ** slap_sasl_mechs( Connection *conn ) ch_free( mechstr ); #endif } -#else +#elif defined(SLAP_BUILTIN_SASL) /* builtin SASL implementation */ SASL_CTX *ctx = conn->c_sasl_authctx; if ( ctx != NULL && ctx->sc_external_id.bv_val ) { @@ -1492,7 +1492,7 @@ int slap_sasl_close( Connection *conn ) free( conn->c_sasl_extra ); conn->c_sasl_extra = NULL; -#else +#elif defined(SLAP_BUILTIN_SASL) SASL_CTX *ctx = conn->c_sasl_authctx; if( ctx ) { if( ctx->sc_external_id.bv_val ) { @@ -1659,8 +1659,7 @@ int slap_sasl_bind( Operation *op, SlapReply *rs ) Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: rc=%d\n", rs->sr_err, 0, 0); #endif - -#else +#elif defined(SLAP_BUILTIN_SASL) /* built-in SASL implementation */ SASL_CTX *ctx = op->o_conn->c_sasl_authctx; @@ -1687,6 +1686,9 @@ int slap_sasl_bind( Operation *op, SlapReply *rs ) send_ldap_error( op, rs, LDAP_AUTH_METHOD_NOT_SUPPORTED, "requested SASL mechanism not supported" ); } +#else + send_ldap_error( op, rs, LDAP_AUTH_METHOD_NOT_SUPPORTED, + "SASL not supported" ); #endif return rs->sr_err; -- 2.39.5