Fixup bdb_entry_release now that entry_decode uses two memory blocks

[openldap] / servers / slapd / sasl.c

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index 29a83f5adab5134da34332cf57fc6e306f1be80a..e3fd7fbcd758b1eb388991442f11b22537b89e66 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -9,12 +9,11 @@
 #include <ac/stdlib.h>
 #include <stdio.h>
 
-#include "slap.h"
-#include "proto-slap.h"
-
 #include <lber.h>
 #include <ldap_log.h>
 
+#include "slap.h"
+
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 #include <sasl.h>
@@ -25,6 +24,7 @@
 #include <lutil.h>
 #endif
 
+
 static sasl_security_properties_t sasl_secprops;
 
 static int
@@ -60,11 +60,11 @@ slap_sasl_log(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-               "SASL [conn=%d] %s: %s\n",
+               "SASL [conn=%ld] %s: %s\n",
                conn ? conn->c_connid : -1,
                label, message ));
 #else
-       Debug( level, "SASL [conn=%d] %s: %s\n",
+       Debug( level, "SASL [conn=%ld] %s: %s\n",
                conn ? conn->c_connid: -1,
                label, message );
 #endif
@@ -112,7 +112,7 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
        if( flags & FLAG_GETDN_AUTHCID ) {
                if( sasl_external_x509dn_convert && conn->c_sasl_bind_mech
                        && ( strcasecmp( "EXTERNAL", conn->c_sasl_bind_mech ) == 0 ) 
-                       && len && dn[0] == '/' && dn[len-1]== '/' )
+                       && len && id[0] == '/' /* && id[len-1]== '/' */)
                {
                        /* check SASL external for X.509 style DN and */
                        /* convert to dn:<dn> form */
@@ -611,19 +611,19 @@ int slap_sasl_bind(
 #ifdef HAVE_CYRUS_SASL
        sasl_conn_t *ctx = conn->c_sasl_context;
        struct berval response;
-       unsigned reslen;
+       unsigned reslen = 0;
        const char *errstr;
        int sc;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-                  "sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%d\n",
+                  "sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%ld\n",
                   conn->c_connid, dn,
                   conn->c_sasl_bind_in_progress ? "<continuing>" : conn->c_sasl_bind_mech,
                   cred ? cred->bv_len : 0 ));
 #else
        Debug(LDAP_DEBUG_ARGS,
-         "==> sasl_bind: dn=\"%s\" mech=%s datalen=%d\n", dn,
+         "==> sasl_bind: dn=\"%s\" mech=%s datalen=%ld\n", dn,
          conn->c_sasl_bind_in_progress ? "<continuing>":conn->c_sasl_bind_mech,
          cred ? cred->bv_len : 0 );
 #endif
@@ -638,7 +638,8 @@ int slap_sasl_bind(
        if ( !conn->c_sasl_bind_in_progress ) {
                sc = sasl_server_start( ctx,
                        conn->c_sasl_bind_mech,
-                       cred->bv_val, cred->bv_len,
+                       cred->bv_len ? cred->bv_val : "",
+                       cred->bv_len,
                        (char **)&response.bv_val, &reslen, &errstr );
 
        } else {
@@ -712,6 +713,10 @@ int slap_sasl_bind(
                        NULL, errstr, NULL, NULL );
        }
 
+       if( response.bv_len ) {
+               ch_free( response.bv_val );
+       }
+
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
                   "slap_sasl_bind: rc=%d\n", rc ));