Skip to content

GitLab

Commit f49fd8a9 authored by Gary Williams's avatar Gary Williams
Browse files

fix format

parent cd1284c4
Expand all Hide whitespace changes
Inline Side-by-side
servers/slapd/abandon.c
View file @ f49fd8a9
......@@ -36,7 +36,7 @@ do_abandon(
int rc, notfound;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n", conn->c_connid));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n", conn->c_connid));
#else
Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
#endif
......@@ -49,9 +49,9 @@ do_abandon(
if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"conn: %d do_abandon: ber_scanf failed\n",
conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"conn: %d do_abandon: ber_scanf failed\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
#endif
......@@ -66,16 +66,16 @@ do_abandon(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_abandon: conn: %d id=%ld\n", conn->c_connid, (long) id ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_abandon: conn: %d id=%ld\n", conn->c_connid, (long) id ));
#else
Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
#endif
if( id <= 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
#else
Debug( LDAP_DEBUG_ANY,
"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
......@@ -120,9 +120,9 @@ done:
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_abandon: conn: %d op=%ld %sfound\n",
conn->c_connid, (long)id, notfound ? "not " : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_abandon: conn: %d op=%ld %sfound\n",
conn->c_connid, (long)id, notfound ? "not " : "" ));
#else
Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
(long) id, notfound ? "not " : "", 0 );
......
servers/slapd/acl.c
View file @ f49fd8a9
This diff is collapsed.
servers/slapd/add.c
View file @ f49fd8a9
......@@ -47,8 +47,8 @@ do_add( Connection *conn, Operation *op )
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_add: conn %d enter\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_add: conn %d enter\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_add\n", 0, 0, 0 );
#endif
......@@ -67,8 +67,8 @@ do_add( Connection *conn, Operation *op )
/* get the name */
if ( ber_scanf( ber, "{a", /*}*/ &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
......@@ -81,8 +81,8 @@ do_add( Connection *conn, Operation *op )
if ( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
#else
Debug( LDAP_DEBUG_ANY, "do_add: invalid dn (%s)\n", dn, 0, 0 );
#endif
......@@ -101,8 +101,8 @@ do_add( Connection *conn, Operation *op )
e->e_private = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_add: conn %d ndn (%s)\n", conn->c_connid, e->e_ndn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_add: conn %d ndn (%s)\n", conn->c_connid, e->e_ndn ));
#else
Debug( LDAP_DEBUG_ARGS, "do_add: ndn (%s)\n", e->e_ndn, 0, 0 );
#endif
......@@ -119,8 +119,8 @@ do_add( Connection *conn, Operation *op )
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d decoding error \n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d decoding error \n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_add: decoding error\n", 0, 0, 0 );
#endif
......@@ -133,9 +133,9 @@ do_add( Connection *conn, Operation *op )
if ( mod->ml_bvalues == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d no values for type %s\n",
conn->c_connid, mod->ml_type ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d no values for type %s\n",
conn->c_connid, mod->ml_type ));
#else
Debug( LDAP_DEBUG_ANY, "no values for type %s\n",
mod->ml_type, 0, 0 );
......@@ -153,8 +153,8 @@ do_add( Connection *conn, Operation *op )
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_add: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_add: ber_scanf failed\n", 0, 0, 0 );
#endif
......@@ -166,8 +166,8 @@ do_add( Connection *conn, Operation *op )
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_add: get_ctrls failed\n", 0, 0, 0 );
#endif
......@@ -287,13 +287,13 @@ do_add( Connection *conn, Operation *op )
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d no backend support\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_add: conn %d no backend support\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ARGS, " do_add: no backend support\n", 0, 0, 0 );
#endif
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
NULL, "operation not supported within namingContext", NULL, NULL );
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
NULL, "operation not supported within namingContext", NULL, NULL );
}
done:
......
servers/slapd/ava.c
View file @ f49fd8a9
......@@ -44,8 +44,8 @@ get_ava(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_ava: ber_scanf failure\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_ava: ber_scanf failure\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
#endif
......
servers/slapd/backend.c
View file @ f49fd8a9
......@@ -97,8 +97,8 @@ int backend_init(void)
if((nBackendInfo != 0) || (backendInfo != NULL)) {
/* already initialized */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"backend_init: backend already initialized\n" ));
LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
"backend_init: backend already initialized\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_init: already initialized.\n", 0, 0, 0 );
......@@ -114,9 +114,9 @@ int backend_init(void)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"backend_init: initialized for type \"%s\"\n",
binfo[nBackendInfo].bi_type ));
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"backend_init: initialized for type \"%s\"\n",
binfo[nBackendInfo].bi_type ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_init: initialized for type \"%s\"\n",
......@@ -205,9 +205,9 @@ int backend_startup(Backend *be)
if( ! ( nBackendDB > 0 ) ) {
/* no databases */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"backend_startup: %d databases to startup. \n",
nBackendDB ));
LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
"backend_startup: %d databases to startup. \n",
nBackendDB ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: %d databases to startup.\n",
......@@ -219,9 +219,9 @@ int backend_startup(Backend *be)
if(be != NULL) {
/* startup a specific backend database */
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"backend_startup: starting \"%s\"\n",
be->be_suffix[0] ));
LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
"backend_startup: starting \"%s\"\n",
be->be_suffix[0] ));
#else
Debug( LDAP_DEBUG_TRACE,
"backend_startup: starting \"%s\"\n",
......@@ -234,8 +234,8 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_open failed!\n" ));
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_open failed!\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_open failed!\n",
......@@ -251,8 +251,8 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open failed!\n" ));
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open failed!\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_db_open failed!\n",
......@@ -278,8 +278,8 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_open %d failed!\n", i ));
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_open %d failed!\n", i ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_open %d failed!\n",
......@@ -301,8 +301,8 @@ int backend_startup(Backend *be)
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open %d failed!\n", i ));
LDAP_LOG(( "backend", LDAP_LEVEL_CRIT,
"backend_startup: bi_db_open %d failed!\n", i ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_startup: bi_db_open %d failed!\n",
......@@ -360,9 +360,9 @@ int backend_shutdown( Backend *be )
if(rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "backend", LDAP_LEVEL_NOTICE,
"backend_shutdown: bi_close %s failed!\n",
backendDB[i].be_type ));
LDAP_LOG(( "backend", LDAP_LEVEL_NOTICE,
"backend_shutdown: bi_close %s failed!\n",
backendDB[i].be_type ));
#else
Debug( LDAP_DEBUG_ANY,
"backend_close: bi_close %s failed!\n",
......
servers/slapd/bind.c
View file @ f49fd8a9
......@@ -46,7 +46,7 @@ do_bind(
Backend *be;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "do_bind: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_bind\n", 0, 0, 0 );
#endif
......@@ -88,8 +88,8 @@ do_bind(
* }
*
* SaslCredentials ::= SEQUENCE {
* mechanism LDAPString,
* credentials OCTET STRING OPTIONAL
* mechanism LDAPString,
* credentials OCTET STRING OPTIONAL
* }
*/
......@@ -97,8 +97,8 @@ do_bind(
if ( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_bind: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_bind: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "bind: ber_scanf failed\n", 0, 0, 0 );
#endif
......@@ -137,15 +137,15 @@ do_bind(
if ( tag == LBER_ERROR ) {
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR,
"decoding error" );
"decoding error" );
rc = SLAPD_DISCONNECT;
goto cleanup;
}
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_bind: get_ctrls failed\n", 0, 0, 0 );
#endif
......@@ -156,8 +156,8 @@ do_bind(
if ( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d invalid dn (%s)\n", conn->c_connid, dn ));
#else
Debug( LDAP_DEBUG_ANY, "bind: invalid dn (%s)\n", dn, 0, 0 );
#endif
......@@ -168,32 +168,32 @@ do_bind(
if( method == LDAP_AUTH_SASL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_sasl_bind: conn %d dn (%s) mech %s\n", conn->c_connid,
dn, mech ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_sasl_bind: conn %d dn (%s) mech %s\n", conn->c_connid,
dn, mech ));
#else
Debug( LDAP_DEBUG_TRACE, "do_sasl_bind: dn (%s) mech %s\n",
dn, mech, NULL );
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d version=%ld dn=\"%s\" method=%ld\n",
conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d version=%ld dn=\"%s\" method=%ld\n",
conn->c_connid, (unsigned long) version, dn, (unsigned long)method ));
#else
Debug( LDAP_DEBUG_TRACE, "do_bind: version=%ld dn=\"%s\" method=%ld\n",
(unsigned long) version, dn, (unsigned long) method );
#endif
}
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d BIND dn=\"%s\" method=%ld\n",
op->o_connid, op->o_opid, ndn, (unsigned long) method, 0 );
if ( version < LDAP_VERSION_MIN || version > LDAP_VERSION_MAX ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d unknown version = %ld\n",
conn->c_connid, (unsigned long)version ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d unknown version = %ld\n",
conn->c_connid, (unsigned long)version ));
#else
Debug( LDAP_DEBUG_ANY, "do_bind: unknown version=%ld\n",
(unsigned long) version, 0, 0 );
......@@ -223,9 +223,9 @@ do_bind(
if ( version < LDAP_VERSION3 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d sasl with LDAPv%ld\n",
conn->c_connid, (unsigned long)version ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d sasl with LDAPv%ld\n",
conn->c_connid, (unsigned long)version ));
#else
Debug( LDAP_DEBUG_ANY, "do_bind: sasl with LDAPv%ld\n",
(unsigned long) version, 0, 0 );
......@@ -238,9 +238,9 @@ do_bind(
if( mech == NULL || *mech == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d no SASL mechanism provided\n",
conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d no SASL mechanism provided\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"do_bind: no sasl mechanism provided\n",
......@@ -336,12 +336,12 @@ do_bind(
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d anonymous bind\n",
conn->c_connid, version ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d anonymous bind\n",
conn->c_connid, version ));
#else
Debug( LDAP_DEBUG_TRACE, "do_bind: v%d anonymous bind\n",
version, 0, 0 );
version, 0, 0 );
#endif
goto cleanup;
......@@ -353,13 +353,13 @@ do_bind(
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d v%d simple bind(%s) disallowed\n",
conn->c_connid, version, ndn ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d v%d simple bind(%s) disallowed\n",
conn->c_connid, version, ndn ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d simple bind(%s) disallowed\n",
version, ndn, 0 );
version, ndn, 0 );
#endif
goto cleanup;
}
......@@ -374,9 +374,9 @@ do_bind(
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d Kerberos V4 bind\n",
conn->c_connid, version ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d Kerberos V4 bind\n",
conn->c_connid, version ));
#else
Debug( LDAP_DEBUG_TRACE, "do_bind: v%d Kerberos V4 bind\n",
version, 0, 0 );
......@@ -392,9 +392,9 @@ do_bind(
send_ldap_result( conn, op, rc,
NULL, text, NULL, NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d v%d unknown authentication method (%d)\n",
conn->c_connid, version, method ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_bind: conn %d v%d unknown authentication method (%d)\n",
conn->c_connid, version, method ));
#else
Debug( LDAP_DEBUG_TRACE,
"do_bind: v%d unknown authentication method (%d)\n",
......@@ -458,12 +458,12 @@ do_bind(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d bind: \"%s\" to \"%s\" \n",
conn->c_connid, version, conn->c_cdn, conn->c_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_bind: conn %d v%d bind: \"%s\" to \"%s\" \n",
conn->c_connid, version, conn->c_cdn, conn->c_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "do_bind: v%d bind: \"%s\" to \"%s\"\n",
version, conn->c_cdn, conn->c_dn );
version, conn->c_cdn, conn->c_dn );
#endif
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
......
servers/slapd/ch_malloc.c
View file @ f49fd8a9
......@@ -29,9 +29,9 @@ ch_malloc(
if ( (new = (void *) ber_memalloc( size )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_malloc: allocation of %lu bytes failed\n",
(long)size ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_malloc: allocation of %lu bytes failed\n",
(long)size ));
#else
Debug( LDAP_DEBUG_ANY, "ch_malloc of %lu bytes failed\n",
(long) size, 0, 0 );
......@@ -61,8 +61,8 @@ ch_realloc(
if ( (new = (void *) ber_memrealloc( block, size )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_realloc: reallocation of %lu bytes failed\n", (long)size ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_realloc: reallocation of %lu bytes failed\n", (long)size ));
#else
Debug( LDAP_DEBUG_ANY, "ch_realloc of %lu bytes failed\n",
(long) size, 0, 0 );
......@@ -84,9 +84,9 @@ ch_calloc(
if ( (new = (void *) ber_memcalloc( nelem, size )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_calloc: allocation of %lu elements of %lu bytes faild\n",
(long)nelem, (long)size ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"ch_calloc: allocation of %lu elements of %lu bytes faild\n",
(long)nelem, (long)size ));
#else
Debug( LDAP_DEBUG_ANY, "ch_calloc of %lu elems of %lu bytes failed\n",
(long) nelem, (long) size, 0 );
......@@ -107,8 +107,8 @@ ch_strdup(
if ( (new = ber_strdup( string )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"chr_strdup: duplication of \"%s\" failed\n", string ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"chr_strdup: duplication of \"%s\" failed\n", string ));
#else
Debug( LDAP_DEBUG_ANY, "ch_strdup(%s) failed\n", string, 0, 0 );
#endif
......
servers/slapd/compare.c
View file @ f49fd8a9
......@@ -44,8 +44,8 @@ do_compare(
value.bv_val = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_compare: conn %d\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_compare: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
#endif
......@@ -63,8 +63,8 @@ do_compare(
if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
......@@ -75,8 +75,8 @@ do_compare(
if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d get ava failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d get ava failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
#endif
......@@ -88,8 +88,8 @@ do_compare(
if ( ber_scanf( op->o_ber, /*{*/ "}" ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
......@@ -101,8 +101,8 @@ do_compare(
if( ( rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_compare: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_compare: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: get_ctrls failed\n", 0, 0, 0 );
#endif
......@@ -113,9 +113,9 @@ do_compare(
if( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_compare: conn %d invalid dn (%s)\n",
conn->c_connid, dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_compare: conn %d invalid dn (%s)\n",
conn->c_connid, dn ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn, 0, 0 );
#endif
......@@ -126,9 +126,9 @@ do_compare(
if( ndn == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_compare: conn %d compare to root DSE!\n",
conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_compare: conn %d compare to root DSE!\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: root dse!\n", 0, 0, 0 );
#endif
......@@ -190,10 +190,10 @@ do_compare(
ava.aa_value = nvalue;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_compare: conn %d dn (%s) attr(%s) value (%s)\n",
conn->c_connid, dn, ava.aa_desc->ad_cname->bv_val,
ava.aa_value->bv_val ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,