#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 )
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,
#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,
#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 );
COMPLETE:
if( vals ) ber_bvecfree( vals );
- if( ad ) ad_free( ad, 1 );
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
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