Experiment with busy loop protection...

[openldap] / servers / slapd / saslauthz.c

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 0424497996a0352a3f92f7b5c33975fbf717a116..fcc6c05ce9940bfdeecede469c7453bdc4925e59 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -15,21 +15,16 @@
 #include <ac/stdlib.h>
 #include <stdio.h>
 
-#include "slap.h"
-#include "proto-slap.h"
-
 #include <ac/string.h>
 
+#include "slap.h"
+
 #ifdef HAVE_CYRUS_SASL
 #include <limits.h>
 #include <sasl.h>
 #include <ldap_pvt.h>
 #endif
 
-
-
-
-
 /* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]]   */
 
 int slap_parseURI( char *uri, char **searchbase, int *scope, Filter **filter )
@@ -142,7 +137,7 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
        if ( rc ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
-                          "slap_sasl_regexp_config: \"%s\" could not be compiled.\n"
+                          "slap_sasl_regexp_config: \"%s\" could not be compiled.\n",
                           reg->match ));
 #else
                Debug( LDAP_DEBUG_ANY,
@@ -338,7 +333,7 @@ char *slap_sasl2dn( char *saslname )
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
-                  "slap_sasl2dn: performing internal search (base=%s, scope=%s)\n",
+                  "slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
                   searchbase, scope ));
 #else
        Debug( LDAP_DEBUG_TRACE,
@@ -429,7 +424,7 @@ int slap_sasl_match( char *rule, char *assertDN, char *authc )
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-                  "slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule );
+                  "slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule ));
 #else
        Debug( LDAP_DEBUG_TRACE,
           "===>slap_sasl_match: comparing DN %s to rule %s\n", assertDN, rule, 0 );
@@ -640,7 +635,7 @@ int slap_sasl_authorized( char *authcDN, char *authzDN )
 DONE:
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
-                  "slap_sasl_authorized: return %s\n", rc ));
+                  "slap_sasl_authorized: return %d\n", rc ));
 #else
        Debug( LDAP_DEBUG_TRACE, "<== slap_sasl_authorized: return %d\n",rc,0,0 );
 #endif