fix logging macros (thanks Mei)

diff --git a/servers/slapd/sasl.c b/servers/slapd/sasl.c
index f447a75c22c90b82d42fd7c01843b6b465f17476..2bfd7efc1ed2d607729c0db6c1969f4391d46ac5 100644 (file)
--- a/servers/slapd/sasl.c
+++ b/servers/slapd/sasl.c
@@ -311,7 +311,7 @@ slap_sasl_authorize(
 #ifdef NEW_LOGGING
        LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
                   "slap_sasl_authorize: conn %d authorization allowed\n",
-                  (long)(conn ? conn->c_connid : -1 ) );
+                  (long)(conn ? conn->c_connid : -1 ) ));
 #else
        Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
                " authorization allowed\n",

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 0424497996a0352a3f92f7b5c33975fbf717a116..9b54725f10b9fe45455b10eaabc90f307c8a2be5 100644 (file)
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -142,7 +142,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,
@@ -429,7 +429,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 +640,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