mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Converted LDAP_LOG messages to use new Macro

Browse Source
This commit is contained in:
Julius Enarusai 2002-07-23 00:01:53 +00:00
parent 437014723c
commit 2168be2b4a
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
servers/slapd/sasl.c
View File

@ -51,9 +51,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
if ( strcasecmp( cargv[0], "sasl-authz-policy" ) == 0 ) { if ( strcasecmp( cargv[0], "sasl-authz-policy" ) == 0 ) {
if ( cargc != 2 ) { if ( cargc != 2 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: missing policy in \"sasl-authz-policy <policy>\" line\n", "%s: line %d: missing policy in \"sasl-authz-policy <policy>\" line\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: missing policy in \"sasl-authz-policy <policy>\" line\n", "%s: line %d: missing policy in \"sasl-authz-policy <policy>\" line\n",
@ -64,12 +64,12 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
} }
if ( slap_sasl_setpolicy( cargv[1] ) ) { if ( slap_sasl_setpolicy( cargv[1] ) ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: unable " "%s: line %d: unable "
"to parse value \"%s\" " "to parse value \"%s\" "
"in \"sasl-authz-policy " "in \"sasl-authz-policy "
"<policy>\" line.\n", "<policy>\" line.\n",
fname, lineno, cargv[1] )); fname, lineno, cargv[1] );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: unable " "%s: line %d: unable "
@ -86,9 +86,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
} else if ( strcasecmp( cargv[0], "sasl-host" ) == 0 ) { } else if ( strcasecmp( cargv[0], "sasl-host" ) == 0 ) {
if ( cargc < 2 ) { if ( cargc < 2 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: missing host in \"sasl-host <host>\" line\n", "%s: line %d: missing host in \"sasl-host <host>\" line\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: missing host in \"sasl-host <host>\" line\n", "%s: line %d: missing host in \"sasl-host <host>\" line\n",
@ -100,9 +100,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
if ( global_host != NULL ) { if ( global_host != NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: already set sasl-host!\n", "%s: line %d: already set sasl-host!\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: already set sasl-host!\n", "%s: line %d: already set sasl-host!\n",
@ -119,9 +119,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
} else if ( strcasecmp( cargv[0], "sasl-realm" ) == 0 ) { } else if ( strcasecmp( cargv[0], "sasl-realm" ) == 0 ) {
if ( cargc < 2 ) { if ( cargc < 2 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: missing realm in \"sasl-realm <realm>\" line.\n", "%s: line %d: missing realm in \"sasl-realm <realm>\" line.\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: missing realm in \"sasl-realm <realm>\" line\n", "%s: line %d: missing realm in \"sasl-realm <realm>\" line\n",
@ -133,9 +133,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
if ( global_realm != NULL ) { if ( global_realm != NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: already set sasl-realm!\n", "%s: line %d: already set sasl-realm!\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: already set sasl-realm!\n", "%s: line %d: already set sasl-realm!\n",
@ -154,10 +154,10 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
int rc; int rc;
if ( cargc != 3 ) { if ( cargc != 3 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: need 2 args in " "%s: line %d: need 2 args in "
"\"saslregexp <match> <replace>\"\n", "\"saslregexp <match> <replace>\"\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: need 2 args in \"saslregexp <match> <replace>\"\n", "%s: line %d: need 2 args in \"saslregexp <match> <replace>\"\n",
@ -177,10 +177,10 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
if ( cargc < 2 ) { if ( cargc < 2 ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d: missing flags in " "%s: line %d: missing flags in "
"\"sasl-secprops <properties>\" line\n", "\"sasl-secprops <properties>\" line\n",
fname, lineno )); fname, lineno, 0 );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: missing flags in \"sasl-secprops <properties>\" line\n", "%s: line %d: missing flags in \"sasl-secprops <properties>\" line\n",
@ -193,9 +193,9 @@ int slap_sasl_config( int cargc, char **cargv, char *line,
txt = slap_sasl_secprops( cargv[1] ); txt = slap_sasl_secprops( cargv[1] );
if ( txt != NULL ) { if ( txt != NULL ) {
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT, LDAP_LOG( CONFIG, CRIT,
"%s: line %d sasl-secprops: %s\n", "%s: line %d sasl-secprops: %s\n",
fname, lineno, txt )); fname, lineno, txt );
#else #else
Debug( LDAP_DEBUG_ANY, Debug( LDAP_DEBUG_ANY,
"%s: line %d: sasl-secprops: %s\n", "%s: line %d: sasl-secprops: %s\n",
@ -315,7 +315,7 @@ int slap_sasl_getdn( Connection *conn, char *id, int len,
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG( TRANSPORT, ENTRY, LDAP_LOG( TRANSPORT, ENTRY,
"slap_sasl_getdn: conn %d id=%s\n", "slap_sasl_getdn: conn %d id=%s\n",
conn ? conn->c_connid : -1, id ? (*id ? id : "<empty>") : "NULL" ); conn ? conn->c_connid : -1, id ? (*id ? id : "<empty>") : "NULL", 0 );
#else #else
Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n", Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n",
id?(*id?id:"<empty>"):"NULL",0,0 ); id?(*id?id:"<empty>"):"NULL",0,0 );
@ -1436,9 +1436,9 @@ slap_sasl_setpass(
} }
#ifdef NEW_LOGGING #ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY, LDAP_LOG( BACKEND, ENTRY,
"slap_sasl_setpass: \"%s\"\n", "slap_sasl_setpass: \"%s\"\n",
id.bv_val ? id.bv_val : "" )); id.bv_val ? id.bv_val : "", 0, 0);
#else #else
Debug( LDAP_DEBUG_ARGS, "==> slap_sasl_setpass: \"%s\"\n", Debug( LDAP_DEBUG_ARGS, "==> slap_sasl_setpass: \"%s\"\n",
id.bv_val ? id.bv_val : "", 0, 0 ); id.bv_val ? id.bv_val : "", 0, 0 );