upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-24 16:49:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix format

Browse source
This commit is contained in:
Gary Williams 2001-01-17 16:35:53 +00:00
parent cd1284c4a9
commit f49fd8a98e
40 changed files with 1290 additions and 1286 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
servers/slapd/abandon.c
View file

@ -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 );

288
servers/slapd/acl.c
View file

@ -90,12 +90,12 @@ access_allowed(
const char *attr = desc ? desc->ad_cname->bv_val : NULL;
regmatch_t matches[MAXREMATCHES];
regmatch_t matches[MAXREMATCHES];
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n",
conn->c_connid, access2str( access ), e->e_dn, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %d %s access to \"%s\" \"%s\" requested\n",
conn->c_connid, access2str( access ), e->e_dn, attr ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access to \"%s\" \"%s\" requested\n",
@ -111,9 +111,9 @@ access_allowed(
/* grant database root access */
if ( be != NULL && be_isroot( be, op->o_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"access_allowed: conn %d root access granted\n",
conn->c_connid));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"access_allowed: conn %d root access granted\n",
conn->c_connid));
#else
Debug( LDAP_DEBUG_ACL,
"<= root access granted\n",
@ -132,11 +132,11 @@ access_allowed(
&& desc != slap_schema.si_ad_children )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d NoUserMod Operational attribute: %s access granted\n",
conn->c_connid, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d NoUserMod Operational attribute: %s access granted\n",
conn->c_connid, attr ));
#else
Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
attr, 0, 0 );
#endif
@ -146,10 +146,10 @@ access_allowed(
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
be->be_dfltaccess >= access ? "granted" : "denied", op->o_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
@ -163,10 +163,10 @@ access_allowed(
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
global_default_access >= access ? "granted" : "denied", op->o_dn ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( access ),
global_default_access >= access ? "granted" : "denied", op->o_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
@ -190,9 +190,9 @@ access_allowed(
for (i = 0; i < MAXREMATCHES && matches[i].rm_so > 0; i++) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d match[%d]: %d %d ",
conn->c_connid, i, (int)matches[i].rm_so, (int)matches[i].rm_eo ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d match[%d]: %d %d ",
conn->c_connid, i, (int)matches[i].rm_so, (int)matches[i].rm_eo ));
#else
Debug( LDAP_DEBUG_ACL, "=> match[%d]: %d %d ", i,
(int)matches[i].rm_so, (int)matches[i].rm_eo );
@ -204,7 +204,7 @@ access_allowed(
}
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS, "\n" ));
#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
#endif
@ -222,9 +222,9 @@ access_allowed(
if ( ACL_IS_INVALID( mask ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d \"%s\" (%s) invalid!\n",
conn->c_connid, e->e_dn, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d \"%s\" (%s) invalid!\n",
conn->c_connid, e->e_dn, attr ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
@ -234,8 +234,8 @@ access_allowed(
} else if ( control == ACL_BREAK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d no more rules\n", conn->c_connid ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"access_allowed: conn %d no more rules\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0);
@ -244,11 +244,11 @@ access_allowed(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %d %s access %s by %s\n",
access2str( access ),
ACL_GRANT( mask, access ) ? "granted" : "denied",
accessmask2str( mask, accessmaskbuf ) ));
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"access_allowed: conn %d %s access %s by %s\n",
access2str( access ),
ACL_GRANT( mask, access ) ? "granted" : "denied",
accessmask2str( mask, accessmaskbuf ) ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: %s access %s by %s\n",
@ -305,9 +305,9 @@ acl_get(
if (a->acl_dn_pat != NULL) {
if ( a->acl_dn_style == ACL_STYLE_REGEX ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dnpat [%d] %s nsub: %d\n",
*count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dnpat [%d] %s nsub: %d\n",
*count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub ));
#else
Debug( LDAP_DEBUG_ACL, "=> dnpat: [%d] %s nsub: %d\n",
*count, a->acl_dn_pat, (int) a->acl_dn_re.re_nsub );
@ -317,9 +317,9 @@ acl_get(
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dn [%d] %s\n",
*count, a->acl_dn_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: dn [%d] %s\n",
*count, a->acl_dn_pat ));
#else
Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
*count, a->acl_dn_pat, 0 );
@ -367,9 +367,9 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] matched\n",
*count ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] matched\n",
*count ));
#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
*count, 0, 0 );
@ -384,20 +384,20 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] check attr %s\n",
*count, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] check attr %s\n",
*count, attr ));
#else
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
*count, attr, 0);
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] check attr %s\n",
*count, attr, 0);
#endif
if ( attr == NULL || a->acl_attrs == NULL ||
ad_inlist( desc, a->acl_attrs ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] acl %s attr: %s\n",
*count, e->e_dn, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_get: [%d] acl %s attr: %s\n",
*count, e->e_dn, attr ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_get: [%d] acl %s attr: %s\n",
@ -409,8 +409,8 @@ acl_get(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_get: done.\n" ));
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_get: done.\n" ));
#else
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
#endif
@ -451,15 +451,15 @@ acl_mask(
assert( mask != NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_mask: conn %d access to entry \"%s\", attr \"%s\" requested\n",
conn->c_connid, e->e_dn, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_ENTRY,
"acl_mask: conn %d access to entry \"%s\", attr \"%s\" requested\n",
conn->c_connid, e->e_dn, attr ));
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
" to %s by \"%s\", (%s) \n",
val ? "value" : "all values",
op->o_ndn ? op->o_ndn : "",
accessmask2str( *mask, accessmaskbuf ) ));
LDAP_LOG(( "acl", LDAP_LEVEL_ARGS,
" to %s by \"%s\", (%s) \n",
val ? "value" : "all values",
op->o_ndn ? op->o_ndn : "",
accessmask2str( *mask, accessmaskbuf ) ));
#else
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
@ -480,9 +480,9 @@ acl_mask(
/* AND <who> clauses */
if ( b->a_dn_pat != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_dn_pat: %s\n",
conn->c_connid, b->a_dn_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_dn_pat: %s\n",
conn->c_connid, b->a_dn_pat ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat, 0, 0);
@ -572,9 +572,9 @@ acl_mask(
if ( b->a_sockurl_pat != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockurl_pat: %s\n",
conn->c_connid, b->a_sockurl_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockurl_pat: %s\n",
conn->c_connid, b->a_sockurl_pat ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat, 0, 0 );
@ -596,9 +596,9 @@ acl_mask(
if ( b->a_domain_pat != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_domain_pat: %s\n",
conn->c_connid, b->a_domain_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_domain_pat: %s\n",
conn->c_connid, b->a_domain_pat ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat, 0, 0 );
@ -619,9 +619,9 @@ acl_mask(
if ( b->a_peername_pat != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_perrname_path: %s\n",
conn->c_connid, b->a_peername_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_perrname_path: %s\n",
conn->c_connid, b->a_peername_pat ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat, 0, 0 );
@ -642,9 +642,9 @@ acl_mask(
if ( b->a_sockname_pat != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockname_path: %s\n",
conn->c_connid, b->a_sockname_pat ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_sockname_path: %s\n",
conn->c_connid, b->a_sockname_pat ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat, 0, 0 );
@ -671,9 +671,9 @@ acl_mask(
const char *desc = b->a_dn_at->ad_cname->bv_val;
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_dn_pat: %s\n",
conn->c_connid, desc ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_dn_pat: %s\n",
conn->c_connid, desc ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n",
desc, 0, 0);
@ -771,9 +771,9 @@ acl_mask(
if ( b->a_authz.sai_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_ssf, op->o_ssf ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_ssf, op->o_ssf ));
#else
Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
b->a_authz.sai_ssf, op->o_ssf, 0 );
@ -785,9 +785,9 @@ acl_mask(
if ( b->a_authz.sai_transport_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_transport_ssf, op->o_transport_ssf ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_transport_ssf, op->o_transport_ssf ));
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
@ -800,9 +800,9 @@ acl_mask(
if ( b->a_authz.sai_tls_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_tls_ssf, op->o_tls_ssf ));
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
@ -815,15 +815,15 @@ acl_mask(
if ( b->a_authz.sai_sasl_ssf ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
conn->c_connid, b->a_authz.sai_sasl_ssf, op->o_sasl_ssf ));
#else
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_sasl_ssf: ACL %u > OP %u\n",
b->a_authz.sai_sasl_ssf, op->o_sasl_ssf, 0 );
#endif
if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
continue;
}
}
@ -890,7 +890,7 @@ acl_mask(
* by clauses that return grant/deny pairs. Right now, it does either
* additive or subtractive rights, but not both at the same time. So,
* we need to combine the grant/deny pair into a single rights mask in
* a smart way: if either grant or deny is "empty", then we use the
* a smart way: if either grant or deny is "empty", then we use the
* opposite as is, otherwise we remove any denied rights from the grant
* rights mask and construct an additive mask.
*/
@ -911,11 +911,11 @@ acl_mask(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
"acl_mask: conn %d [%d] applying %s (%s)\n",
conn->c_connid, i, accessmask2str( modmask, accessmaskbuf),
b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
? "break" : "stop" ));
LDAP_LOG(( "acl", LDAP_LEVEL_RESULTS,
"acl_mask: conn %d [%d] applying %s (%s)\n",
conn->c_connid, i, accessmask2str( modmask, accessmaskbuf),
b->a_type == ACL_CONTINUE ? "continue" : b->a_type == ACL_BREAK
? "break" : "stop" ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] applying %s (%s)\n",
@ -949,9 +949,9 @@ acl_mask(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d [%d] mask: %s\n",
conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_mask: conn %d [%d] mask: %s\n",
conn->c_connid, i, accessmask2str( *mask, accessmaskbuf) ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
@ -970,9 +970,9 @@ acl_mask(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_RESULTS,
"acl_mask: conn %d no more <who> clauses, returning %d (stop)\n",
conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
LDAP_LOG(( "aci", LDAP_LEVEL_RESULTS,
"acl_mask: conn %d no more <who> clauses, returning %d (stop)\n",
conn->c_connid, accessmask2str( *mask, accessmaskbuf) ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more <who> clauses, returning %s (stop)\n",
@ -1004,9 +1004,9 @@ acl_check_modlist(
/* short circuit root database access */
if ( be_isroot( be, op->o_ndn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d access granted to root user\n",
conn->c_connid ));
LDAP_LOG(( "acl", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d access granted to root user\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
@ -1018,10 +1018,10 @@ acl_check_modlist(
/* use backend default access if no backend acls */
if( be != NULL && be->be_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d backend default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
be->be_dfltaccess >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: backend default %s access %s to \"%s\"\n",
@ -1035,10 +1035,10 @@ acl_check_modlist(
/* use global default access if no global acls */
} else if ( be == NULL && global_acl == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d global default %s access %s to \"%s\"\n",
conn->c_connid, access2str( ACL_WRITE ),
global_default_access >= ACL_WRITE ? "granted" : "denied", op->o_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: global default %s access %s to \"%s\"\n",
@ -1057,11 +1057,11 @@ acl_check_modlist(
*/
if ( is_at_no_user_mod( mlist->sml_desc->ad_type ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d no-user-mod %s: modify access granted\n",
conn->c_connid, mlist->sml_desc->ad_cname->bv_val ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"acl_check_modlist: conn %d no-user-mod %s: modify access granted\n",
conn->c_connid, mlist->sml_desc->ad_cname->bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
mlist->sml_desc->ad_cname->bv_val, 0, 0 );
#endif
@ -1180,10 +1180,10 @@ char **
aci_set_gather (void *cookie, char *name, char *attr)
{
struct {
Backend *be;
Entry *e;
Connection *conn;
Operation *op;
Backend *be;
Entry *e;
Connection *conn;
Operation *op;
} *cp = (void *)cookie;
struct berval **bvals = NULL;
char **vals = NULL;
@ -1235,10 +1235,10 @@ aci_match_set (
char *set = NULL;
int rc = 0;
struct {
Backend *be;
Entry *e;
Connection *conn;
Operation *op;
Backend *be;
Entry *e;
Connection *conn;
Operation *op;
} cookie;
if (setref == 0) {
@ -1656,10 +1656,10 @@ string_expand(
char *match,
regmatch_t *matches)
{
int size;
int size;
char *sp;
char *dp;
int flag;
int flag;
size = 0;
newbuf[0] = '\0';
@ -1673,9 +1673,9 @@ string_expand(
*dp++ = '$';
size++;
} else if (*sp >= '0' && *sp <= '9' ) {
int n;
int i;
int l;
int n;
int i;
int l;
n = *sp - '0';
*dp = '\0';
@ -1707,10 +1707,10 @@ string_expand(
*dp = '\0';
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: pattern = %s\n", pat ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: expanded = %s\n", newbuf ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: pattern = %s\n", pat ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL1,
"string_expand: expanded = %s\n", newbuf ));
#else
Debug( LDAP_DEBUG_TRACE, "=> string_expand: pattern: %s\n", pat, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "=> string_expand: expanded: %s\n", newbuf, 0, 0 );
@ -1737,9 +1737,9 @@ regex_matches(
regerror(rc, &re, error, sizeof(error));
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
"regex_matches: compile( \"%s\", \"%s\") failed %s\n",
pat, str, error ));
LDAP_LOG(( "aci", LDAP_LEVEL_ERR,
"regex_matches: compile( \"%s\", \"%s\") failed %s\n",
pat, str, error ));
#else
Debug( LDAP_DEBUG_TRACE,
"compile( \"%s\", \"%s\") failed %s\n",
@ -1752,14 +1752,14 @@ regex_matches(
regfree( &re );
#ifdef NEW_LOGGING
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: string: %s\n", str ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: rc: %d %s\n",
rc, rc ? "matches" : "no matches" ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: string: %s\n", str ));
LDAP_LOG(( "aci", LDAP_LEVEL_DETAIL2,
"regex_matches: rc: %d %s\n",
rc, rc ? "matches" : "no matches" ));
#else
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: string: %s\n", str, 0, 0 );
"=> regex_matches: string: %s\n", str, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );

44
servers/slapd/add.c
View file

@ -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:

4
servers/slapd/ava.c
View file

@ -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

44
servers/slapd/backend.c
View file

@ -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",

88
servers/slapd/bind.c
View file

@ -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 );

20
servers/slapd/ch_malloc.c
View file

@ -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

40
servers/slapd/compare.c
View file

@ -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,
"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 ));
#else
Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
dn, ava.aa_desc->ad_cname->bv_val, ava.aa_value->bv_val );

252
servers/slapd/connection.c
View file

@ -74,8 +74,8 @@ int connections_init(void)
if( connections != NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connections_init: already initialized.\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connections_init: already initialized.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "connections_init: already initialized.\n",
0, 0, 0 );
@ -90,9 +90,9 @@ int connections_init(void)
if( connections == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connections_init: allocation (%d * %ld) of connection array failed\n",
dtblsize, (long) sizeof(Connection) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connections_init: allocation (%d * %ld) of connection array failed\n",
dtblsize, (long) sizeof(Connection) ));
#else
Debug( LDAP_DEBUG_ANY,
"connections_init: allocation (%d*%ld) of connection array failed\n",
@ -123,8 +123,8 @@ int connections_destroy(void)
if( connections == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connections_destroy: nothing to destroy.\n"));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connections_destroy: nothing to destroy.\n"));
#else
Debug( LDAP_DEBUG_ANY, "connections_destroy: nothing to destroy.\n",
0, 0, 0 );
@ -185,7 +185,7 @@ int connections_timeout_idle(time_t now)
int connindex;
Connection* c;
for( c = connection_first( &connindex );
for( c = connection_first( &connindex );
c != NULL;
c = connection_next( c, &connindex ) )
{
@ -208,8 +208,8 @@ static Connection* connection_get( ber_socket_t s )
Connection *c;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ENTRY,
"connection_get: socket %ld\n", (long)s ));
LDAP_LOG(( "connection", LDAP_LEVEL_ENTRY,
"connection_get: socket %ld\n", (long)s ));
#else
Debug( LDAP_DEBUG_ARGS,
"connection_get(%ld)\n",
@ -273,8 +273,8 @@ static Connection* connection_get( ber_socket_t s )
assert( sd == AC_SOCKET_INVALID );
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
"connection_get: connection %d not used\n", s ));
LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
"connection_get: connection %d not used\n", s ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): connection not used\n",
@ -286,8 +286,8 @@ static Connection* connection_get( ber_socket_t s )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"connection_get: get for %d got connid %ld\n",s, c->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"connection_get: get for %d got connid %ld\n",s, c->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_get(%d): got connid=%ld\n",
@ -300,7 +300,7 @@ static Connection* connection_get( ber_socket_t s )
assert( c->c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID );
c->c_activitytime = slap_get_time();
c->c_activitytime = slap_get_time();
}
return c;
@ -336,12 +336,12 @@ long connection_init(
if( s == AC_SOCKET_INVALID ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: init of socket %ld invalid.\n", (long)s ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: init of socket %ld invalid.\n", (long)s ));
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%ld): invalid.\n",
(long) s, 0, 0 );
Debug( LDAP_DEBUG_ANY,
"connection_init(%ld): invalid.\n",
(long) s, 0, 0 );
#endif
return -1;
}
@ -362,43 +362,43 @@ long connection_init(
c = NULL;
for( i=0; i < dtblsize; i++) {
ber_socket_t sd;
for( i=0; i < dtblsize; i++) {
ber_socket_t sd;
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_sb == 0 );
c = &connections[i];
break;
}
if( connections[i].c_struct_state == SLAP_C_UNINITIALIZED ) {
assert( connections[i].c_sb == 0 );
c = &connections[i];
break;
}
sd = AC_SOCKET_INVALID;
if (connections[i].c_sb != NULL)
ber_sockbuf_ctrl( connections[i].c_sb, LBER_SB_OPT_GET_FD, &sd );
ber_sockbuf_ctrl( connections[i].c_sb, LBER_SB_OPT_GET_FD, &sd );
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( sd == AC_SOCKET_INVALID );
c = &connections[i];
break;
}
if( connections[i].c_struct_state == SLAP_C_UNUSED ) {
assert( sd == AC_SOCKET_INVALID );
c = &connections[i];
break;
}
assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID );
}
assert( connections[i].c_struct_state == SLAP_C_USED );
assert( connections[i].c_conn_state != SLAP_C_INVALID );
assert( sd != AC_SOCKET_INVALID );
}
if( c == NULL ) {
if( c == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: skt %d connection table full (%d/%d)\n",
s, i, dtblsize ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: skt %d connection table full (%d/%d)\n",
s, i, dtblsize ));
#else
Debug( LDAP_DEBUG_ANY,
Debug( LDAP_DEBUG_ANY,
"connection_init(%d): connection table full (%d/%d)\n",
s, i, dtblsize);
#endif
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
}
ldap_pvt_thread_mutex_unlock( &connections_mutex );
return -1;
}
}
#endif
@ -406,30 +406,30 @@ long connection_init(
if( c->c_struct_state == SLAP_C_UNINITIALIZED ) {
c->c_authmech = NULL;
c->c_dn = NULL;
c->c_cdn = NULL;
c->c_dn = NULL;
c->c_cdn = NULL;
c->c_listener_url = NULL;
c->c_peer_domain = NULL;
c->c_peer_name = NULL;
c->c_sock_name = NULL;
c->c_peer_name = NULL;
c->c_sock_name = NULL;
c->c_ops = NULL;
c->c_pending_ops = NULL;
c->c_ops = NULL;
c->c_pending_ops = NULL;
c->c_sasl_bind_mech = NULL;
c->c_sasl_context = NULL;
c->c_sasl_extra = NULL;
c->c_sb = ber_sockbuf_alloc( );
c->c_sb = ber_sockbuf_alloc( );
c->c_currentber = NULL;
/* should check status of thread calls */
ldap_pvt_thread_mutex_init( &c->c_mutex );
ldap_pvt_thread_mutex_init( &c->c_write_mutex );
ldap_pvt_thread_cond_init( &c->c_write_cv );
/* should check status of thread calls */
ldap_pvt_thread_mutex_init( &c->c_mutex );
ldap_pvt_thread_mutex_init( &c->c_write_mutex );
ldap_pvt_thread_cond_init( &c->c_write_cv );
c->c_struct_state = SLAP_C_UNUSED;
c->c_struct_state = SLAP_C_UNUSED;
}
ldap_pvt_thread_mutex_lock( &c->c_mutex );
@ -486,9 +486,9 @@ long connection_init(
c /* non-NULL */ ) < 0 )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: conn %d set nonblocking failed\n",
c->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_init: conn %d set nonblocking failed\n",
c->c_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"connection_init(%d, %s): set nonblocking failed\n",
@ -536,8 +536,8 @@ void connection2anonymous( Connection *c )
}
if(c->c_dn != NULL) {
free(c->c_dn);
c->c_dn = NULL;
free(c->c_dn);
c->c_dn = NULL;
}
if(c->c_cdn != NULL) {
@ -624,7 +624,7 @@ connection_destroy( Connection *c )
c->c_connid, sd, 0, 0, 0 );
}
ber_sockbuf_free( c->c_sb );
ber_sockbuf_free( c->c_sb );
c->c_sb = ber_sockbuf_alloc( );
c->c_conn_state = SLAP_C_INVALID;
@ -681,9 +681,9 @@ void connection_closing( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_closing: conn %d readying socket %d for close.\n",
c->c_connid, sd ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_closing: conn %d readying socket %d for close.\n",
c->c_connid, sd ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_closing: readying conn=%ld sd=%d for close\n",
@ -718,9 +718,9 @@ static void connection_close( Connection *c )
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_GET_FD, &sd );
if( c->c_ops != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_close: conn %d deferring sd %d\n",
c->c_connid, sd ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_close: conn %d deferring sd %d\n",
c->c_connid, sd ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_close: deferring conn=%ld sd=%d\n",
@ -730,9 +730,9 @@ static void connection_close( Connection *c )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"connection_close: conn %d sd %d\n",
c->c_connid, sd ));
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"connection_close: conn %d sd %d\n",
c->c_connid, sd ));
#else
Debug( LDAP_DEBUG_TRACE, "connection_close: conn=%ld sd=%d\n",
c->c_connid, sd, 0 );
@ -836,9 +836,9 @@ connection_operation( void *arg_v )
if( conn->c_sasl_bind_in_progress && tag != LDAP_REQ_BIND ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_operation: conn %d SASL bind in progress (tag=%ld).\n",
conn->c_connid, (long)tag ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_operation: conn %d SASL bind in progress (tag=%ld).\n",
conn->c_connid, (long)tag ));
#else
Debug( LDAP_DEBUG_ANY, "connection_operation: "
"error: SASL bind in progress (tag=%ld).\n",
@ -893,9 +893,9 @@ connection_operation( void *arg_v )
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_operation: conn %d unknown LDAP request 0x%lx\n",
conn->c_connid, tag ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_operation: conn %d unknown LDAP request 0x%lx\n",
conn->c_connid, tag ));
#else
Debug( LDAP_DEBUG_ANY, "unknown LDAP request 0x%lx\n",
tag, 0, 0 );
@ -962,9 +962,9 @@ int connection_read(ber_socket_t s)
if( c == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_read: sock %ld no connection\n",
(long)s ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_read: sock %ld no connection\n",
(long)s ));
#else
Debug( LDAP_DEBUG_ANY,
"connection_read(%ld): no connection!\n",
@ -980,9 +980,9 @@ int connection_read(ber_socket_t s)
if( c->c_conn_state == SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_read: conn %d connection closing, ignoring input\n",
c->c_connid));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_read: conn %d connection closing, ignoring input\n",
c->c_connid));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): closing, ignoring input for id=%ld\n",
@ -994,8 +994,8 @@ int connection_read(ber_socket_t s)
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_read: conn %d checking for input.\n", c->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_read: conn %d checking for input.\n", c->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): checking for input on id=%ld\n",
@ -1010,9 +1010,9 @@ int connection_read(ber_socket_t s)
fd_set rfd;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d TLS accept error, error %d\n",
c->c_connid, rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d TLS accept error, error %d\n",
c->c_connid, rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): TLS accept error "
@ -1071,9 +1071,9 @@ int connection_read(ber_socket_t s)
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d SASL install error %d, closing\n",
c->c_connid, rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d SASL install error %d, closing\n",
c->c_connid, rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): SASL install error "
@ -1104,9 +1104,9 @@ int connection_read(ber_socket_t s)
if( rc < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d input error %d, closing.\n",
c->c_connid, rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_read: conn %d input error %d, closing.\n",
c->c_connid, rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): input error=%d id=%ld, closing.\n",
@ -1147,8 +1147,8 @@ connection_input(
if ( conn->c_currentber == NULL && (conn->c_currentber = ber_alloc())
== NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_alloc failed.\n", conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_alloc failed.\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
#endif
@ -1165,9 +1165,9 @@ connection_input(
ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_get_next failed, errno %d (%s).\n",
conn->c_connid, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_get_next failed, errno %d (%s).\n",
conn->c_connid, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_TRACE,
"ber_get_next on fd %d failed errno=%d (%s)\n",
@ -1189,9 +1189,9 @@ connection_input(
if ( (tag = ber_get_int( ber, &msgid )) != LDAP_TAG_MSGID ) {
/* log, close and send error */
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_get_int returns 0x%lx.\n",
conn->c_connid, tag ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_get_int returns 0x%lx.\n",
conn->c_connid, tag ));
#else
Debug( LDAP_DEBUG_ANY, "ber_get_int returns 0x%lx\n", tag, 0,
0 );
@ -1203,9 +1203,9 @@ connection_input(
if ( (tag = ber_peek_tag( ber, &len )) == LBER_ERROR ) {
/* log, close and send error */
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_peek_tag returns 0x%lx.\n",
conn->c_connid, tag ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_input: conn %d ber_peek_tag returns 0x%lx.\n",
conn->c_connid, tag ));
#else
Debug( LDAP_DEBUG_ANY, "ber_peek_tag returns 0x%lx\n", tag, 0,
0 );
@ -1226,9 +1226,9 @@ connection_input(
|| conn->c_conn_state == SLAP_C_CLOSING )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_input: conn %d deferring operation\n",
conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_input: conn %d deferring operation\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "deferring operation\n", 0, 0, 0 );
#endif
@ -1266,9 +1266,9 @@ connection_resched( Connection *conn )
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_resched: conn %d reaquiring locks.\n",
conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_resched: conn %d reaquiring locks.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_resched: reaquiring locks conn=%ld sd=%d\n",
@ -1286,9 +1286,9 @@ connection_resched( Connection *conn )
if( conn->c_conn_state != SLAP_C_CLOSING ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_resched: conn %d closed by other thread.\n",
conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"connection_resched: conn %d closed by other thread.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
"closed by other thread conn=%ld sd=%d\n",
@ -1296,9 +1296,9 @@ connection_resched( Connection *conn )
#endif
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_resched: conn %d attempting closing.\n",
conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_resched: conn %d attempting closing.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "connection_resched: "
"attempting closing conn=%ld sd=%d\n",
@ -1368,9 +1368,9 @@ static int connection_op_activate( Connection *conn, Operation *op )
if ( status != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_op_activate: conn %d thread pool submit failed.\n",
conn->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_op_activate: conn %d thread pool submit failed.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"ldap_pvt_thread_pool_submit failed (%d)\n", status, 0, 0 );
@ -1394,8 +1394,8 @@ int connection_write(ber_socket_t s)
if( c == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_write: sock %ld no connection!\n",(long)s));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"connection_write: sock %ld no connection!\n",(long)s));
#else
Debug( LDAP_DEBUG_ANY,
"connection_write(%ld): no connection!\n",
@ -1409,9 +1409,9 @@ int connection_write(ber_socket_t s)
c->c_n_write++;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_write conn %d waking output.\n",
c->c_connid ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"connection_write conn %d waking output.\n",
c->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE,
"connection_write(%d): waking output for id=%ld\n",

34
servers/slapd/controls.c
View file

@ -56,8 +56,8 @@ int get_ctrls(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"get_ctrls: conn %d\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"get_ctrls: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls\n", 0, 0, 0 );
#endif
@ -121,9 +121,9 @@ int get_ctrls(
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get OID failed.\n",
conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get OID failed.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get oid failed.\n",
0, 0, 0 );
@ -143,9 +143,9 @@ int get_ctrls(
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get crit failed.\n",
conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get crit failed.\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get crit failed.\n",
0, 0, 0 );
@ -162,10 +162,10 @@ int get_ctrls(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
conn->c_connid, tctrl->ldctl_oid,
tctrl->ldctl_iscritical ? "" : "non" ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d oid=\"%s\" (%scritical)\n",
conn->c_connid, tctrl->ldctl_oid,
tctrl->ldctl_iscritical ? "" : "non" ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: oid=\"%s\" (%scritical)\n",
tctrl->ldctl_oid,
@ -177,8 +177,8 @@ int get_ctrls(
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get value failed.\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"get_ctrls: conn %d get value failed.\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "=> get_ctrls: get value failed.\n",
0, 0, 0 );
@ -204,9 +204,9 @@ int get_ctrls(
return_results:
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
"get_ctrls: conn %s %d %d %s\n",
conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_RESULTS,
"get_ctrls: conn %s %d %d %s\n",
conn->c_connid, nctrls, rc, errmsg ? errmsg : "" ));
#else
Debug( LDAP_DEBUG_TRACE, "<= get_ctrls: %d %d %s\n",
nctrls, rc, errmsg ? errmsg : "");

298
servers/slapd/daemon.c
View file

@ -203,11 +203,11 @@ static void slapd_add(ber_socket_t s) {
FD_SET( s, &slap_daemon.sd_readers );
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_add: added %ld%s%s\n",
(long)s,
FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_add: added %ld%s%s\n",
(long)s,
FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: added %ld%s%s\n",
(long) s,
@ -224,11 +224,11 @@ void slapd_remove(ber_socket_t s, int wake) {
ldap_pvt_thread_mutex_lock( &slap_daemon.sd_mutex );
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_remove: removing %ld%s%s\n",
(long) s,
FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_remove: removing %ld%s%s\n",
(long) s,
FD_ISSET(s, &slap_daemon.sd_readers) ? "r" : "",
FD_ISSET(s, &slap_daemon.sd_writers) ? "w" : "" ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: removing %ld%s%s\n",
(long) s,
@ -287,8 +287,8 @@ void slapd_set_read(ber_socket_t s, int wake) {
static void slapd_close(ber_socket_t s) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_close: closing %ld\n", (long)s ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_close: closing %ld\n", (long)s ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: closing %ld\n",
(long) s, 0, 0 );
@ -331,9 +331,9 @@ static int slap_get_listener_addresses(
/* host specifies a service in this case */
if (err = getaddrinfo(NULL, host, &hints, &res)) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err) ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err), 0, 0);
@ -349,9 +349,9 @@ static int slap_get_listener_addresses(
hints.ai_family = AF_UNSPEC;
if (err = getaddrinfo(host, serv, &hints, &res)) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err) ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: getaddrinfo failed: %s\n",
AC_GAI_STRERROR(err), 0, 0);
@ -432,9 +432,9 @@ static int slap_get_listener_addresses(
if ( strlen(host) >
(sizeof(((struct sockaddr_un *)*sal)->sun_path) - 1) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
host ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: domain socket path (%s) too long in URL\n",
host ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: domain socket path (%s) too long in URL",
@ -455,9 +455,9 @@ static int slap_get_listener_addresses(
struct hostent *he = gethostbyname( host );
if( he == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: invalid host %s\n",
host ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_get_listener_addresses: invalid host %s\n",
host ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: invalid host %s", host, 0, 0);
@ -509,9 +509,9 @@ static Listener * slap_open_listener(
if( rc != LDAP_URL_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: listen URL \"%s\" parse error %d\n",
url, rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: listen URL \"%s\" parse error %d\n",
url, rc ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: listen URL \"%s\" parse error=%d\n",
@ -523,9 +523,9 @@ static Listener * slap_open_listener(
#ifndef HAVE_TLS
if( ldap_pvt_url_scheme2tls( lud->lud_scheme ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: TLS is not supported (%s)\n",
url ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: TLS is not supported (%s)\n",
url ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: TLS not supported (%s)\n",
@ -559,9 +559,9 @@ static Listener * slap_open_listener(
#else
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: URL scheme is not supported: %s\n",
url ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: URL scheme is not supported: %s\n",
url ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: URL scheme not supported: %s",
url, 0, 0);
@ -603,9 +603,9 @@ static Listener * slap_open_listener(
if ( l.sl_sd == AC_SOCKET_INVALID ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: socket() failed errno=%d (%s)\n",
err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: socket() failed errno=%d (%s)\n",
err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: socket() failed errno=%d (%s)\n", err,
@ -617,9 +617,9 @@ static Listener * slap_open_listener(
#ifndef HAVE_WINSOCK
if ( l.sl_sd >= dtblsize ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: listener descriptor %ld is too great %ld\n",
(long)l.sl_sd, (long)dtblsize ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_open_listener: listener descriptor %ld is too great %ld\n",
(long)l.sl_sd, (long)dtblsize ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: listener descriptor %ld is too great %ld\n",
@ -644,9 +644,9 @@ static Listener * slap_open_listener(
if ( rc == AC_SOCKET_ERROR ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) failed errno %d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: setsockopt( %ld, SO_REUSEADDR ) failed errno %d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(SO_REUSEADDR) failed errno=%d (%s)\n",
@ -676,9 +676,9 @@ static Listener * slap_open_listener(
break;
err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: bind(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: bind(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed errno=%d (%s)\n",
(long) l.sl_sd, err, sock_errstr(err) );
@ -689,8 +689,8 @@ static Listener * slap_open_listener(
if ( *sal == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: bind(%ld) failed.\n", (long)l.sl_sd ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: bind(%ld) failed.\n", (long)l.sl_sd ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: bind(%ld) failed\n",
(long) l.sl_sd, 0, 0 );
@ -706,9 +706,9 @@ static Listener * slap_open_listener(
if ( chmod( addr, S_IRWXU ) < 0 ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: fchmod(%ld) failed errno=%d (%s)\n",
(long)l.sl_sd, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: fchmod(%ld) failed errno=%d (%s)",
(long) l.sl_sd, err, sock_errstr(err) );
@ -749,9 +749,9 @@ static Listener * slap_open_listener(
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: unsupported address family (%d)\n",
(int)(*sal)->sa_family ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_open_listener: unsupported address family (%d)\n",
(int)(*sal)->sa_family ));
#else
Debug( LDAP_DEBUG_ANY, "daemon: unsupported address family (%d)\n",
(int) (*sal)->sa_family, 0, 0 );
@ -766,8 +766,8 @@ static Listener * slap_open_listener(
*li = l;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"slap_open_listener: daemon initialzed %s\n", l.sl_url ));
LDAP_LOG(( "connection", LDAP_LEVEL_RESULTS,
"slap_open_listener: daemon initialzed %s\n", l.sl_url ));
#else
Debug( LDAP_DEBUG_TRACE, "daemon: initialized %s\n",
l.sl_url, 0, 0 );
@ -784,9 +784,9 @@ int slapd_daemon_init( const char *urls )
char **u;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
"slapd_daemon_init: %s\n",
urls ? urls : "<null>" ));
LDAP_LOG(( "connection", LDAP_LEVEL_ARGS,
"slapd_daemon_init: %s\n",
urls ? urls : "<null>" ));
#else
Debug( LDAP_DEBUG_ARGS, "daemon_init: %s\n",
urls ? urls : "<null>", 0, 0 );
@ -816,8 +816,8 @@ int slapd_daemon_init( const char *urls )
*/
if( (rc = lutil_pair( wake_sds )) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_daemon_init: lutil_pair() failed rc=%d\n", rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_daemon_init: lutil_pair() failed rc=%d\n", rc ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: lutil_pair() failed rc=%d\n", rc, 0, 0 );
@ -836,8 +836,8 @@ int slapd_daemon_init( const char *urls )
if( u == NULL || u[0] == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_daemon_init: no urls (%s) provided.\n", urls ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slap_daemon_init: no urls (%s) provided.\n", urls ));
#else
Debug( LDAP_DEBUG_ANY, "daemon_init: no urls (%s) provided.\n",
urls, 0, 0 );
@ -847,8 +847,8 @@ int slapd_daemon_init( const char *urls )
for( i=0; u[i] != NULL; i++ ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slap_daemon_init: listen on %s\n.", u[i] ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slap_daemon_init: listen on %s\n.", u[i] ));
#else
Debug( LDAP_DEBUG_TRACE, "daemon_init: listen on %s\n",
u[i], 0, 0 );
@ -857,8 +857,8 @@ int slapd_daemon_init( const char *urls )
if( i == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_daemon_init: no listeners to open (%s)\n", urls ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_daemon_init: no listeners to open (%s)\n", urls ));
#else
Debug( LDAP_DEBUG_ANY, "daemon_init: no listeners to open (%s)\n",
urls, 0, 0 );
@ -868,8 +868,8 @@ int slapd_daemon_init( const char *urls )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_daemon_init: %d listeners to open...\n", i ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slap_daemon_init: %d listeners to open...\n", i ));
#else
Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners to open...\n",
i, 0, 0 );
@ -887,8 +887,8 @@ int slapd_daemon_init( const char *urls )
slap_listeners[i] = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slap_daemon_init: %d listeners opened\n", i ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slap_daemon_init: %d listeners opened\n", i ));
#else
Debug( LDAP_DEBUG_TRACE, "daemon_init: %d listeners opened\n",
i, 0, 0 );
@ -938,9 +938,9 @@ slapd_daemon_task(
if ( listen( slap_listeners[l]->sl_sd, SLAPD_LISTEN ) == -1 ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n",
slap_listeners[l]->sl_url, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: listen( %s, 5 ) failed errno=%d (%s)\n",
slap_listeners[l]->sl_url, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: listen(%s, 5) failed errno=%d (%s)\n",
@ -977,7 +977,7 @@ slapd_daemon_task(
Sockaddr from;
#if defined(SLAPD_RLOOKUPS)
struct hostent *hp;
struct hostent *hp;
#endif
struct timeval zero;
struct timeval *tvp;
@ -1041,9 +1041,9 @@ slapd_daemon_task(
continue;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_daemon_task: select: listen=%d active_threads=%d tvp=%s\n",
slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_daemon_task: select: listen=%d active_threads=%d tvp=%s\n",
slap_listeners[l]->sl_sd, at, tvp == NULL ? "NULL" : "zero" ));
#else
Debug( LDAP_DEBUG_CONNS,
"daemon: select: listen=%d active_threads=%d tvp=%s\n",
@ -1076,9 +1076,9 @@ slapd_daemon_task(
if( err != EINTR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slapd_daemon_task: select failed (%d): %s\n",
err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slapd_daemon_task: select failed (%d): %s\n",
err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_CONNS,
"daemon: select failed (%d): %s\n",
@ -1092,13 +1092,13 @@ slapd_daemon_task(
case 0: /* timeout - let threads run */
ebadf = 0;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: select timeout - yielding\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: select timeout - yielding\n" ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: select timeout - yielding\n",
0, 0, 0 );
#endif
ldap_pvt_thread_yield();
ldap_pvt_thread_yield();
continue;
default: /* something happened - deal with it */
@ -1106,8 +1106,8 @@ slapd_daemon_task(
ebadf = 0;
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: activity on %d descriptors\n", ns ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: activity on %d descriptors\n", ns ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: activity on %d descriptors\n",
ns, 0, 0 );
@ -1154,9 +1154,9 @@ slapd_daemon_task(
if ( s == AC_SOCKET_INVALID ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
(long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
(long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: accept(%ld) failed errno=%d (%s)\n",
@ -1170,9 +1170,9 @@ slapd_daemon_task(
/* make sure descriptor number isn't too great */
if ( s >= dtblsize ) {
#ifdef NEW_LGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: %ld beyond descriptor table size %ld\n",
(long)s, (long)dtblsize ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: %ld beyond descriptor table size %ld\n",
(long)s, (long)dtblsize ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: %ld beyond descriptor table size %ld\n",
@ -1210,9 +1210,9 @@ slapd_daemon_task(
if ( rc == AC_SOCKET_ERROR ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE) failed errno=%d (%s)\n",
(long)s, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: setsockopt( %ld, SO_KEEPALIVE) failed errno=%d (%s)\n",
(long)s, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(SO_KEEPALIVE) failed "
@ -1228,9 +1228,9 @@ slapd_daemon_task(
if ( rc == AC_SOCKET_ERROR ) {
int err = sock_errno();
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: setsockopt( %ld, TCP_NODELAY) failed errno=%d (%s)\n",
(long)s, err, sock_errstr(err) ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon_task: setsockopt( %ld, TCP_NODELAY) failed errno=%d (%s)\n",
(long)s, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_ANY,
"slapd(%ld): setsockopt(TCP_NODELAY) failed "
@ -1242,8 +1242,8 @@ slapd_daemon_task(
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_daemon_task: new connection on %ld\n", (long)s ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL1,
"slapd_daemon_task: new connection on %ld\n", (long)s ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: new connection on %ld\n",
(long) s, 0, 0 );
@ -1346,9 +1346,9 @@ slapd_daemon_task(
if( id < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slapd_daemon_task: connection_init(%ld, %s, %s) failed.\n",
(long)s, peername, slap_listeners[l]->sl_name ));
LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
"slapd_daemon_task: connection_init(%ld, %s, %s) failed.\n",
(long)s, peername, slap_listeners[l]->sl_name ));
#else
Debug( LDAP_DEBUG_ANY,
"daemon: connection_init(%ld, %s, %s) failed.\n",
@ -1373,16 +1373,16 @@ slapd_daemon_task(
#ifdef LDAP_DEBUG
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: activity on " ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: activity on " ));
#else
Debug( LDAP_DEBUG_CONNS, "daemon: activity on:", 0, 0, 0 );
#endif
#ifdef HAVE_WINSOCK
for ( i = 0; i < readfds.fd_count; i++ ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s", readfs.fd_array[i], "r", 0 );
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s", readfs.fd_array[i], "r", 0 );
#else
Debug( LDAP_DEBUG_CONNS, " %d%s",
readfds.fd_array[i], "r", 0 );
@ -1390,8 +1390,8 @@ slapd_daemon_task(
}
for ( i = 0; i < writefds.fd_count; i++ ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s", writefds.fd_array[i], "w" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s", writefds.fd_array[i], "w" ));
#else
Debug( LDAP_DEBUG_CONNS, " %d%s",
writefds.fd_array[i], "w", 0 );
@ -1416,9 +1416,9 @@ slapd_daemon_task(
w = FD_ISSET( i, &writefds );
if ( r || w ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s%s", i,
r ? "r" : "", w ? "w" : "" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
" %d%s%s", i,
r ? "r" : "", w ? "w" : "" ));
#else
Debug( LDAP_DEBUG_CONNS, " %d%s%s", i,
r ? "r" : "", w ? "w" : "" );
@ -1427,7 +1427,7 @@ slapd_daemon_task(
}
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, "\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2, "\n" ));
#else
Debug( LDAP_DEBUG_CONNS, "\n", 0, 0, 0 );
#endif
@ -1462,8 +1462,8 @@ slapd_daemon_task(
continue;
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: write active on %d\n", wd ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: write active on %d\n", wd ));
#else
Debug( LDAP_DEBUG_CONNS,
"daemon: write active on %d\n",
@ -1511,8 +1511,8 @@ slapd_daemon_task(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: read activity on %d\n", rd ));
LDAP_LOG(( "connection", LDAP_LEVEL_DETAIL2,
"slapd_daemon_task: read activity on %d\n", rd ));
#else
Debug ( LDAP_DEBUG_CONNS,
"daemon: read activity on %d\n", rd, 0, 0 );
@ -1533,8 +1533,8 @@ slapd_daemon_task(
if( slapd_shutdown > 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown requested and initiated.\n"));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown requested and initiated.\n"));
#else
Debug( LDAP_DEBUG_TRACE,
"daemon: shutdown requested and initiated.\n",
@ -1544,32 +1544,36 @@ slapd_daemon_task(
} else if ( slapd_shutdown < 0 ) {
#ifdef HAVE_NT_SERVICE_MANAGER
if (slapd_shutdown == -1)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown initiated by Service Manager.\n"));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown initiated by Service Manager.\n"));
#else
Debug( LDAP_DEBUG_TRACE,
"daemon: shutdown initiated by Service Manager.\n",
0, 0, 0);
Debug( LDAP_DEBUG_TRACE,
"daemon: shutdown initiated by Service Manager.\n",
0, 0, 0);
#endif
}
else
#endif
{
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: abnormal condition, shutdown initiated.\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: abnormal condition, shutdown initiated.\n" ));
#else
Debug( LDAP_DEBUG_TRACE,
"daemon: abnormal condition, shutdown initiated.\n",
0, 0, 0 );
Debug( LDAP_DEBUG_TRACE,
"daemon: abnormal condition, shutdown initiated.\n",
0, 0, 0 );
#endif
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: no active streams, shutdown initiated.\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: no active streams, shutdown initiated.\n" ));
#else
Debug( LDAP_DEBUG_TRACE,
"daemon: no active streams, shutdown initiated.\n",
0, 0, 0 );
"daemon: no active streams, shutdown initiated.\n",
0, 0, 0 );
#endif
}
@ -1586,9 +1590,9 @@ slapd_daemon_task(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",
ldap_pvt_thread_pool_backload(&connection_pool) ));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slapd_daemon_task: shutdown waiting for %d threads to terminate.\n",
ldap_pvt_thread_pool_backload(&connection_pool) ));
#else
Debug( LDAP_DEBUG_ANY,
"slapd shutdown: waiting for %d threads to terminate\n",
@ -1617,18 +1621,18 @@ int slapd_daemon( void )
if ( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n", rc ));
LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
"slapd_daemon: listener ldap_pvt_thread_create failed (%d).\n", rc ));
#else
Debug( LDAP_DEBUG_ANY,
"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
"listener ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
#endif
return rc;
}
/* wait for the listener thread to complete */
ldap_pvt_thread_join( listener_tid, (void *) NULL );
}
}
#else
/* experimental code */
slapd_daemon_task( NULL );
@ -1650,21 +1654,21 @@ int sockinit(void)
err = WSAStartup( wVersionRequested, &wsaData );
if ( err != 0 ) {
/* Tell the user that we couldn't find a usable */
/* WinSock DLL. */
/* WinSock DLL. */
return -1;
}
/* Confirm that the WinSock DLL supports 2.0.*/
/* Note that if the DLL supports versions greater */
/* than 2.0 in addition to 2.0, it will still return */
/* 2.0 in wVersion since that is the version we */
/* requested. */
/* 2.0 in wVersion since that is the version we */
/* requested. */
if ( LOBYTE( wsaData.wVersion ) != 2 ||
HIBYTE( wsaData.wVersion ) != 0 )
{
/* Tell the user that we couldn't find a usable */
/* WinSock DLL. */
/* WinSock DLL. */
WSACleanup();
return -1;
}
@ -1691,8 +1695,8 @@ RETSIGTYPE
slap_sig_shutdown( int sig )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slap_sig_shutdown: signal %d\n", sig ));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slap_sig_shutdown: signal %d\n", sig ));
#else
Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: signal %d\n", sig, 0, 0);
#endif
@ -1706,8 +1710,8 @@ slap_sig_shutdown( int sig )
#if HAVE_NT_SERVICE_MANAGER && SIGBREAK
if (is_NT_Service && sig == SIGBREAK)
#ifdef NEW_LOGGING
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slap_sig_shutdown: SIGBREAK ignored.\n" ));
LDAP_LOG(( "connection", LDAP_LEVEL_CRIT,
"slap_sig_shutdown: SIGBREAK ignored.\n" ));
#else
Debug(LDAP_DEBUG_TRACE, "slap_sig_shutdown: SIGBREAK ignored.\n",
0, 0, 0);

20
servers/slapd/delete.c
View file

@ -38,8 +38,8 @@ do_delete(
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_delete: conn %d\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_delete: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_delete\n", 0, 0, 0 );
#endif
@ -52,8 +52,8 @@ do_delete(
if ( ber_scanf( op->o_ber, "a", &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_delete: conn: %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_delete: conn: %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
@ -64,8 +64,8 @@ do_delete(
if( ( rc = get_ctrls( conn, op, 1 ) ) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "oepration", LDAP_LEVEL_ERR,
"do_delete: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG(( "oepration", LDAP_LEVEL_ERR,
"do_delete: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_delete: get_ctrls failed\n", 0, 0, 0 );
#endif
@ -76,8 +76,8 @@ do_delete(
if( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_delete: conn %d invalid dn (%s).\n", conn->c_connid, dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_delete: conn %d invalid dn (%s).\n", conn->c_connid, dn ));
#else
Debug( LDAP_DEBUG_ANY, "do_delete: invalid dn (%s)\n", dn, 0, 0 );
#endif
@ -88,8 +88,8 @@ do_delete(
if( ndn == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_delete: conn %d Attempt to delete root DSE.\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_delete: conn %d Attempt to delete root DSE.\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_delete: root dse!\n", 0, 0, 0 );
#endif

10
servers/slapd/dn.c
View file

@ -236,9 +236,9 @@ dn_validate( char *dn_in )
default:
dn = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"dn_validate: unknown state %d for dn \"%s\".\n",
state, dn_in ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"dn_validate: unknown state %d for dn \"%s\".\n",
state, dn_in ));
#else
Debug( LDAP_DEBUG_ANY,
"dn_validate - unknown state %d\n", state, 0, 0 );
@ -279,8 +279,8 @@ dn_validate( char *dn_in )
/*
* dn_normalize - put dn into a canonical form suitable for storing
* in a hash database. this involves normalizing the case as well as
* the format. the dn is normalized in place as well as returned if valid.
* in a hash database. this involves normalizing the case as well as
* the format. the dn is normalized in place as well as returned if valid.
*/
char *

102
servers/slapd/entry.c
View file

@ -16,9 +16,9 @@
#include "slap.h"
static unsigned char *ebuf; /* buf returned by entry2str */
static unsigned char *ebuf; /* buf returned by entry2str */
static unsigned char *ecur; /* pointer to end of currently used ebuf */
static int emaxsize;/* max size of ebuf */
static int emaxsize;/* max size of ebuf */
int entry_destroy(void)
{
@ -59,8 +59,8 @@ str2entry( char *s )
*/
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"str2entry: \"%s\"\n", s ? s : "NULL" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"str2entry: \"%s\"\n", s ? s : "NULL" ));
#else
Debug( LDAP_DEBUG_TRACE, "=> str2entry\n",
s ? s : "NULL", 0, 0 );
@ -71,8 +71,8 @@ str2entry( char *s )
if( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"str2entry: entry allocation failed.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"str2entry: entry allocation failed.\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"<= str2entry NULL (entry allocation failed)\n",
@ -100,8 +100,8 @@ str2entry( char *s )
if ( ldif_parse_line( s, &type, &value.bv_val, &value.bv_len ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: NULL (parse_line)\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: NULL (parse_line)\n" ));
#else
Debug( LDAP_DEBUG_TRACE,
"<= str2entry NULL (parse_line)\n", 0, 0, 0 );
@ -114,9 +114,9 @@ str2entry( char *s )
if ( e->e_dn != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
e->e_id, e->e_dn, value.bv_val != NULL ? value.bv_val : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
e->e_id, e->e_dn, value.bv_val != NULL ? value.bv_val : "" ));
#else
Debug( LDAP_DEBUG_ANY,
"str2entry: entry %ld has multiple dns \"%s\" and \"%s\" (second ignored)\n",
@ -136,8 +136,8 @@ str2entry( char *s )
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: str2ad(%s): %s\n", type, text ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: str2ad(%s): %s\n", type, text ));
#else
Debug( slapMode & SLAP_TOOL_MODE
? LDAP_DEBUG_ANY : LDAP_DEBUG_TRACE,
@ -154,8 +154,8 @@ str2entry( char *s )
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: str2undef_ad(%s): %s\n", type, text ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: str2undef_ad(%s): %s\n", type, text ));
#else
Debug( LDAP_DEBUG_ANY,
"<= str2entry: str2undef_ad(%s): %s\n",
@ -174,9 +174,9 @@ str2entry( char *s )
if( !validate ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2entry: no validator for syntax %s\n",
ad->ad_type->sat_syntax->ssyn_oid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2entry: no validator for syntax %s\n",
ad->ad_type->sat_syntax->ssyn_oid ));
#else
Debug( LDAP_DEBUG_ANY,
"str2entry: no validator for syntax %s\n",
@ -195,9 +195,9 @@ str2entry( char *s )
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"str2entry: invalid value for syntax %s\n",
ad->ad_type->sat_syntax->ssyn_oid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"str2entry: invalid value for syntax %s\n",
ad->ad_type->sat_syntax->ssyn_oid ));
#else
Debug( LDAP_DEBUG_ANY,
"str2entry: invalid value for syntax %s\n",
@ -216,8 +216,8 @@ str2entry( char *s )
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: NULL (attr_merge)\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"str2entry: NULL (attr_merge)\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"<= str2entry NULL (attr_merge)\n", 0, 0, 0 );
@ -235,8 +235,8 @@ str2entry( char *s )
/* check to make sure there was a dn: line */
if ( e->e_dn == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2entry: entry %ld has no dn.\n", e->e_id ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2entry: entry %ld has no dn.\n", e->e_id ));
#else
Debug( LDAP_DEBUG_ANY, "str2entry: entry %ld has no dn\n",
e->e_id, 0, 0 );
@ -250,8 +250,8 @@ str2entry( char *s )
(void) dn_normalize( e->e_ndn );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
"str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
"str2entry(%s) -> 0x%lx\n", e->e_dn, (unsigned long)e ));
#else
Debug(LDAP_DEBUG_TRACE, "<= str2entry(%s) -> 0x%lx\n",
e->e_dn, (unsigned long) e, 0 );
@ -344,7 +344,7 @@ entry_free( Entry *e )
*
* the Entry has three entry points (ways to find things):
*
* by entry e.g., if you already have an entry from the cache
* by entry e.g., if you already have an entry from the cache
* and want to delete it. (really by entry ptr)
* by dn e.g., when looking for the base object of a search
* by id e.g., for search candidates
@ -400,8 +400,8 @@ int entry_decode( struct berval *bv, Entry **entry )
ber = ber_init( bv );
if( ber == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: ber_init failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: ber_init failed\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"<= entry_decode: ber_init failed\n",
@ -415,8 +415,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if( e == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: entry allocation failed.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: entry allocation failed.\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"<= entry_decode: entry allocation failed\n",
@ -439,8 +439,8 @@ int entry_decode( struct berval *bv, Entry **entry )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
"entry_decode: \"%s\"\n", e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL2,
"entry_decode: \"%s\"\n", e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE,
"entry_decode: \"%s\"\n",
@ -460,8 +460,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if ( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: decoding error (%s)\n", e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: decoding error (%s)\n", e->e_dn ));
#else
Debug( LDAP_DEBUG_ANY, "entry_decode: decoding error\n", 0, 0, 0 );
#endif
@ -471,8 +471,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if ( vals == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: no values for type %s\n", type ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"entry_decode: no values for type %s\n", type ));
#else
Debug( LDAP_DEBUG_ANY, "entry_decode: no values for type %s\n",
type, 0, 0 );
@ -487,8 +487,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: str2ad(%s): %s\n", type, text ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: str2ad(%s): %s\n", type, text ));
#else
Debug( LDAP_DEBUG_TRACE,
"<= entry_decode: str2ad(%s): %s\n", type, text, 0 );
@ -497,8 +497,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: str2undef_ad(%s): %s\n", type, text));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: str2undef_ad(%s): %s\n", type, text));
#else
Debug( LDAP_DEBUG_ANY,
"<= entry_decode: str2undef_ad(%s): %s\n",
@ -516,8 +516,8 @@ int entry_decode( struct berval *bv, Entry **entry )
if( rc != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: attr_merge failed\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_decode: attr_merge failed\n"));
#else
Debug( LDAP_DEBUG_ANY,
"<= entry_decode: attr_merge failed\n", 0, 0, 0 );
@ -539,8 +539,8 @@ int entry_decode( struct berval *bv, Entry **entry )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"entry_decode: %s\n", e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"entry_decode: %s\n", e->e_dn ));
#else
Debug(LDAP_DEBUG_TRACE, "<= entry_decode(%s)\n",
e->e_dn, 0, 0 );
@ -559,9 +559,9 @@ int entry_encode(
BerElement *ber;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"entry_encode: id: 0x%08lx \"%s\"\n",
e->e_id, e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"entry_encode: id: 0x%08lx \"%s\"\n",
e->e_id, e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE, "=> entry_encode(0x%08lx): %s\n",
e->e_id, e->e_dn, 0 );
@ -596,8 +596,8 @@ done:
ber_free( ber, 1 );
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_encode: id=0x%08lx failed (%d)\n", e->e_id, rc ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"entry_encode: id=0x%08lx failed (%d)\n", e->e_id, rc ));
#else
Debug( LDAP_DEBUG_ANY, "=> entry_encode(0x%08lx): failed (%d)\n",
e->e_id, rc, 0 );

40
servers/slapd/extended.c
View file

@ -12,15 +12,15 @@
/*
* LDAPv3 Extended Operation Request
* ExtendedRequest ::= [APPLICATION 23] SEQUENCE {
* requestName [0] LDAPOID,
* requestValue [1] OCTET STRING OPTIONAL
* requestName [0] LDAPOID,
* requestValue [1] OCTET STRING OPTIONAL
* }
*
* LDAPv3 Extended Operation Response
* ExtendedResponse ::= [APPLICATION 24] SEQUENCE {
* COMPONENTS OF LDAPResult,
* responseName [10] LDAPOID OPTIONAL,
* response [11] OCTET STRING OPTIONAL
* responseName [10] LDAPOID OPTIONAL,
* response [11] OCTET STRING OPTIONAL
* }
*
*/
@ -43,7 +43,7 @@ typedef struct extop_list_t {
extop_list_t *supp_ext_list = NULL;
/* this list of built-in extops is for extops that are not part
* of backends or in external modules. essentially, this is
* of backends or in external modules. essentially, this is
* just a way to get built-in extops onto the extop list without
* having a separate init routine for each built-in extop.
*/
@ -94,8 +94,8 @@ do_extended(
LDAPControl **rspctrls;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_extended: conn %s\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_extended: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_extended\n", 0, 0, 0 );
#endif
@ -104,8 +104,8 @@ do_extended(
if( op->o_protocol < LDAP_VERSION3 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: protocol version (%d) too low.\n", op->o_protocol ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: protocol version (%d) too low.\n", op->o_protocol ));
#else
Debug( LDAP_DEBUG_ANY, "do_extended: protocol version (%d) too low\n",
op->o_protocol, 0 ,0 );
@ -118,8 +118,8 @@ do_extended(
if ( ber_scanf( op->o_ber, "{a" /*}*/, &reqoid ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
#endif
@ -131,9 +131,9 @@ do_extended(
if( !(ext = find_extop(supp_ext_list, reqoid)) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d unsupported operation \"%s\"\n",
conn->c_connid, reqoid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d unsupported operation \"%s\"\n",
conn->c_connid, reqoid ));
#else
Debug( LDAP_DEBUG_ANY, "do_extended: unsupported operation \"%s\"\n",
reqoid, 0 ,0 );
@ -148,8 +148,8 @@ do_extended(
if( ber_peek_tag( op->o_ber, &len ) == LDAP_TAG_EXOP_REQ_VALUE ) {
if( ber_scanf( op->o_ber, "O", &reqdata ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_extended: ber_scanf failed\n", 0, 0 ,0 );
#endif
@ -162,8 +162,8 @@ do_extended(
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d get_ctrls failed\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_extended: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_extended: get_ctrls failed\n", 0, 0 ,0 );
#endif
@ -171,8 +171,8 @@ do_extended(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_extended: conn %d oid=%d\n.", conn->c_connid, reqoid ));
#else
Debug( LDAP_DEBUG_ARGS, "do_extended: oid=%s\n", reqoid, 0 ,0 );
#endif

128
servers/slapd/filter.c
View file

@ -48,8 +48,8 @@ get_filter(
struct berval escaped;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n",
conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY, "get_filter: conn %d\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter\n", 0, 0, 0 );
#endif
@ -69,19 +69,19 @@ get_filter(
* }
*
* SubstringFilter ::= SEQUENCE {
* type AttributeType,
* type AttributeType,
* SEQUENCE OF CHOICE {
* initial [0] IA5String,
* any [1] IA5String,
* final [2] IA5String
* initial [0] IA5String,
* any [1] IA5String,
* final [2] IA5String
* }
* }
*
* MatchingRuleAssertion ::= SEQUENCE {
* matchingRule [1] MatchingRuleId OPTIONAL,
* type [2] AttributeDescription OPTIONAL,
* matchValue [3] AssertionValue,
* dnAttributes [4] BOOLEAN DEFAULT FALSE
* MatchingRuleAssertion ::= SEQUENCE {
* matchingRule [1] MatchingRuleId OPTIONAL,
* type [2] AttributeDescription OPTIONAL,
* matchValue [3] AssertionValue,
* dnAttributes [4] BOOLEAN DEFAULT FALSE
* }
*
*/
@ -103,8 +103,8 @@ get_filter(
switch ( f->f_choice ) {
case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
"get_filter: conn %d EQUALITY\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
"get_filter: conn %d EQUALITY\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "EQUALITY\n", 0, 0, 0 );
#endif
@ -130,8 +130,8 @@ get_filter(
case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d SUBSTRINGS\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d SUBSTRINGS\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "SUBSTRINGS\n", 0, 0, 0 );
#endif
@ -140,8 +140,8 @@ get_filter(
case LDAP_FILTER_GE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d GE\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d GE\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "GE\n", 0, 0, 0 );
#endif
@ -165,8 +165,8 @@ get_filter(
case LDAP_FILTER_LE:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d LE\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d LE\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "LE\n", 0, 0, 0 );
#endif
@ -193,8 +193,8 @@ get_filter(
struct berval type;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d PRESENT\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d PRESENT\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "PRESENT\n", 0, 0, 0 );
#endif
@ -223,8 +223,8 @@ get_filter(
case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d APPROX\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d APPROX\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "APPROX\n", 0, 0, 0 );
#endif
@ -248,8 +248,8 @@ get_filter(
case LDAP_FILTER_AND:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d AND\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d AND\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "AND\n", 0, 0, 0 );
#endif
@ -265,8 +265,8 @@ get_filter(
case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d OR\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d OR\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "OR\n", 0, 0, 0 );
#endif
@ -282,8 +282,8 @@ get_filter(
case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d NOT\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d NOT\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "NOT\n", 0, 0, 0 );
#endif
@ -300,8 +300,8 @@ get_filter(
case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d EXTENSIBLE\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_filter: conn %d EXTENSIBLE\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "EXTENSIBLE\n", 0, 0, 0 );
#endif
@ -333,9 +333,9 @@ get_filter(
default:
(void) ber_skip_tag( ber, &len );
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_filter: conn %d unknown filter type=%lu\n",
conn->c_connid, f->f_choice ));
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_filter: conn %d unknown filter type=%lu\n",
conn->c_connid, f->f_choice ));
#else
Debug( LDAP_DEBUG_ANY, "get_filter: unknown filter type=%lu\n",
f->f_choice, 0, 0 );
@ -369,8 +369,8 @@ get_filter(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
"get_filter: conn %d exit\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL2,
"get_filter: conn %d exit\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter %d\n", err, 0, 0 );
#endif
@ -389,8 +389,8 @@ get_filter_list( Connection *conn, BerElement *ber,
char *last, *ftmp;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_filter_list: conn %d start\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_filter_list: conn %d start\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "begin get_filter_list\n", 0, 0, 0 );
#endif
@ -416,8 +416,8 @@ get_filter_list( Connection *conn, BerElement *ber,
*new = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_filter_list: conn %d exit\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_filter_list: conn %d exit\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "end get_filter_list\n", 0, 0, 0 );
#endif
@ -444,8 +444,8 @@ get_substring_filter(
*text = "error decoding filter";
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_substring_filter: conn %d begin\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_substring_filter: conn %d begin\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "begin get_substring_filter\n", 0, 0, 0 );
#endif
@ -512,9 +512,9 @@ get_substring_filter(
rc = LDAP_PROTOCOL_ERROR;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_filter_substring: conn %d unknown substring choice=%ld\n",
conn->c_connid, (long)tag ));
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"get_filter_substring: conn %d unknown substring choice=%ld\n",
conn->c_connid, (long)tag ));
#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring choice=%ld\n",
@ -538,9 +538,9 @@ get_substring_filter(
switch ( tag ) {
case LDAP_SUBSTRING_INITIAL:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d INITIAL\n",
conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d INITIAL\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, " INITIAL\n", 0, 0, 0 );
#endif
@ -562,9 +562,9 @@ get_substring_filter(
case LDAP_SUBSTRING_ANY:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d ANY\n",
conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d ANY\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, " ANY\n", 0, 0, 0 );
#endif
@ -585,9 +585,9 @@ get_substring_filter(
case LDAP_SUBSTRING_FINAL:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d FINAL\n",
conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"get_substring_filter: conn %d FINAL\n",
conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, " FINAL\n", 0, 0, 0 );
#endif
@ -609,9 +609,9 @@ get_substring_filter(
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"get_substring_filter: conn %d unknown substring type %ld\n",
conn->c_connid, (long)tag ));
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"get_substring_filter: conn %d unknown substring type %ld\n",
conn->c_connid, (long)tag ));
#else
Debug( LDAP_DEBUG_FILTER,
" unknown substring type=%ld\n",
@ -622,9 +622,9 @@ get_substring_filter(
return_error:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"get_substring_filter: conn %d error %ld\n",
conn->c_connid, (long)rc ));
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"get_substring_filter: conn %d error %ld\n",
conn->c_connid, (long)rc ));
#else
Debug( LDAP_DEBUG_FILTER, " error=%ld\n",
(long) rc, 0, 0 );
@ -652,8 +652,8 @@ return_error:
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_substring_filter: conn %d exit\n", conn->c_connid ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"get_substring_filter: conn %d exit\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_FILTER, "end get_substring_filter\n", 0, 0, 0 );
#endif
@ -706,8 +706,8 @@ filter_free( Filter *f )
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"filter_free: unknown filter type %lu\n", f->f_choice ));
LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
"filter_free: unknown filter type %lu\n", f->f_choice ));
#else
Debug( LDAP_DEBUG_ANY, "filter_free: unknown filter type=%lu\n",
f->f_choice, 0, 0 );

84
servers/slapd/filterentry.c
View file

@ -57,7 +57,7 @@ test_filter(
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter: begin\n" ));
"test_filter: begin\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter\n", 0, 0, 0 );
#endif
@ -66,13 +66,13 @@ test_filter(
switch ( f->f_choice ) {
case SLAPD_FILTER_COMPUTED:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: COMPUTED %s (%d)\n",
f->f_result == LDAP_COMPARE_FALSE ? "false" :
f->f_result == LDAP_COMPARE_TRUE ? "true" :
f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
"error",
f->f_result ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: COMPUTED %s (%d)\n",
f->f_result == LDAP_COMPARE_FALSE ? "false" :
f->f_result == LDAP_COMPARE_TRUE ? "true" :
f->f_result == SLAPD_COMPARE_UNDEFINED ? "undefined" :
"error",
f->f_result ));
#else
Debug( LDAP_DEBUG_FILTER, " COMPUTED %s (%d)\n",
f->f_result == LDAP_COMPARE_FALSE ? "false" :
@ -86,8 +86,8 @@ test_filter(
case LDAP_FILTER_EQUALITY:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: EQUALITY\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: EQUALITY\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " EQUALITY\n", 0, 0, 0 );
#endif
@ -98,8 +98,8 @@ test_filter(
case LDAP_FILTER_SUBSTRINGS:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter SUBSTRINGS\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter SUBSTRINGS\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " SUBSTRINGS\n", 0, 0, 0 );
#endif
@ -119,8 +119,8 @@ test_filter(
case LDAP_FILTER_PRESENT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: PRESENT\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: PRESENT\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " PRESENT\n", 0, 0, 0 );
#endif
@ -130,8 +130,8 @@ test_filter(
case LDAP_FILTER_APPROX:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: APPROX\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: APPROX\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " APPROX\n", 0, 0, 0 );
#endif
@ -141,10 +141,10 @@ test_filter(
case LDAP_FILTER_AND:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: AND\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: AND\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " AND\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, " AND\n", 0, 0, 0 );
#endif
rc = test_filter_and( be, conn, op, e, f->f_and );
@ -152,8 +152,8 @@ test_filter(
case LDAP_FILTER_OR:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: OR\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: OR\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " OR\n", 0, 0, 0 );
#endif
@ -163,8 +163,8 @@ test_filter(
case LDAP_FILTER_NOT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: NOT\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: NOT\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " NOT\n", 0, 0, 0 );
#endif
@ -184,8 +184,8 @@ test_filter(
#ifdef SLAPD_EXT_FILTERS
case LDAP_FILTER_EXT:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: EXT\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"test_filter: EXT\n" ));
#else
Debug( LDAP_DEBUG_FILTER, " EXT\n", 0, 0, 0 );
#endif
@ -196,9 +196,9 @@ test_filter(
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"test_filter: unknown filter type %lu\n",
f->f_choice ));
LDAP_LOG(( "filter", LDAP_LEVEL_INFO,
"test_filter: unknown filter type %lu\n",
f->f_choice ));
#else
Debug( LDAP_DEBUG_ANY, " unknown filter type %lu\n",
f->f_choice, 0, 0 );
@ -208,8 +208,8 @@ test_filter(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter: return=%d\n", rc ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter: return=%d\n", rc ));
#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter %d\n", rc, 0, 0 );
#endif
@ -340,8 +340,8 @@ test_filter_and(
int rtn = LDAP_COMPARE_TRUE;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_and: begin\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_and: begin\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_and\n", 0, 0, 0 );
#endif
@ -360,8 +360,8 @@ test_filter_and(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_and: rc=%d\n", rtn ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_and: rc=%d\n", rtn ));
#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_and %d\n", rtn, 0, 0 );
#endif
@ -382,8 +382,8 @@ test_filter_or(
int rtn = LDAP_COMPARE_FALSE;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_or: begin\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_or: begin\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "=> test_filter_or\n", 0, 0, 0 );
#endif
@ -402,8 +402,8 @@ test_filter_or(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_or: result=%d\n", rtn ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_filter_or: result=%d\n", rtn ));
#else
Debug( LDAP_DEBUG_FILTER, "<= test_filter_or %d\n", rtn, 0, 0 );
#endif
@ -424,8 +424,8 @@ test_substrings_filter(
Attribute *a;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_substrings_filter: begin\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_substrings_filter: begin\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "begin test_substrings_filter\n", 0, 0, 0 );
#endif
@ -468,8 +468,8 @@ test_substrings_filter(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_substrings_filter: return FALSE\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"test_substrings_filter: return FALSE\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "end test_substrings_filter 1\n", 0, 0, 0 );
#endif

36
servers/slapd/init.c
View file

@ -75,13 +75,13 @@ slap_init( int mode, const char *name )
if( slapMode != SLAP_UNDEFINED_MODE ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"init: %s init called twice (old=%d, new=%d)\n",
name, slapMode, mode ));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"init: %s init called twice (old=%d, new=%d)\n",
name, slapMode, mode ));
#else
Debug( LDAP_DEBUG_ANY,
"%s init: init called twice (old=%d, new=%d)\n",
name, slapMode, mode );
"%s init: init called twice (old=%d, new=%d)\n",
name, slapMode, mode );
#endif
return 1;
@ -93,9 +93,9 @@ slap_init( int mode, const char *name )
case SLAP_SERVER_MODE:
case SLAP_TOOL_MODE:
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"init: %s initiation, initiated %s.\n",
name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"init: %s initiation, initiated %s.\n",
name, (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server" ));
#else
Debug( LDAP_DEBUG_TRACE,
"%s init: initiated %s.\n", name,
@ -130,11 +130,11 @@ slap_init( int mode, const char *name )
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"init: %s init, undefined mode (%d).\n", name, mode ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"init: %s init, undefined mode (%d).\n", name, mode ));
#else
Debug( LDAP_DEBUG_ANY,
"%s init: undefined mode (%d).\n", name, mode, 0 );
"%s init: undefined mode (%d).\n", name, mode, 0 );
#endif
rc = 1;
@ -149,8 +149,8 @@ int slap_startup( Backend *be )
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"slap_startup: %s started\n", slap_name ));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"slap_startup: %s started\n", slap_name ));
#else
Debug( LDAP_DEBUG_TRACE,
"%s startup: initiated.\n",
@ -168,8 +168,8 @@ int slap_shutdown( Backend *be )
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"slap_shutdown: %s shutdown initiated.\n", slap_name));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"slap_shutdown: %s shutdown initiated.\n", slap_name));
#else
Debug( LDAP_DEBUG_TRACE,
"%s shutdown: initiated\n",
@ -190,9 +190,9 @@ int slap_destroy(void)
int rc;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_destroy: %s freeing system resources.\n",
slap_name ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_destroy: %s freeing system resources.\n",
slap_name ));
#else
Debug( LDAP_DEBUG_TRACE,
"%s shutdown: freeing system resources.\n",

8
servers/slapd/lock.c
View file

@ -31,8 +31,8 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
strcat( buf, ".lock" );
if ( (*lfp = fopen( buf, "w" )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"lock_fopen: could not open lock file \"%s\".\n", buf ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"lock_fopen: could not open lock file \"%s\".\n", buf ));
#else
Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", buf, 0, 0 );
#endif
@ -46,8 +46,8 @@ lock_fopen( const char *fname, const char *type, FILE **lfp )
/* open the log file */
if ( (fp = fopen( fname, type )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"lock_fopen: could not open log file \"%s\".\n", buf ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"lock_fopen: could not open log file \"%s\".\n", buf ));
#else
Debug( LDAP_DEBUG_ANY, "could not open \"%s\"\n", fname, 0, 0 );
#endif

64
servers/slapd/main.c
View file

@ -69,14 +69,14 @@ const char Versionstr[] =
#define DEFAULT_SYSLOG_USER LOG_LOCAL4
typedef struct _str2intDispatch {
char *stringVal;
int abbr;
int intVal;
char *stringVal;
int abbr;
int intVal;
} STRDISP, *STRDISP_P;
/* table to compute syslog-options to integer */
static STRDISP syslog_types[] = {
static STRDISP syslog_types[] = {
{ "LOCAL0", sizeof("LOCAL0"), LOG_LOCAL0 },
{ "LOCAL1", sizeof("LOCAL1"), LOG_LOCAL1 },
{ "LOCAL2", sizeof("LOCAL2"), LOG_LOCAL2 },
@ -90,7 +90,7 @@ static STRDISP syslog_types[] = {
static int cnvt_str2int( char *, STRDISP_P, int );
#endif /* LOG_LOCAL4 */
#endif /* LOG_LOCAL4 */
static void
@ -136,7 +136,7 @@ int main( int argc, char **argv )
char *sandbox = NULL;
#endif
#ifdef LOG_LOCAL4
int syslogUser = DEFAULT_SYSLOG_USER;
int syslogUser = DEFAULT_SYSLOG_USER;
#endif
#ifdef HAVE_NT_SERVICE_MANAGER
@ -144,8 +144,8 @@ int main( int argc, char **argv )
#else
char *configfile = SLAPD_DEFAULT_CONFIGFILE;
#endif
char *serverName = NULL;
int serverMode = SLAP_SERVER_MODE;
char *serverName = NULL;
int serverMode = SLAP_SERVER_MODE;
#ifdef CSRIMALLOC
FILE *leakfile;
@ -176,8 +176,8 @@ int main( int argc, char **argv )
{
slap_debug = *i;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new debug level from registry is: %d\n", slap_debug ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new debug level from registry is: %d\n", slap_debug ));
#else
Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
#endif
@ -191,8 +191,8 @@ int main( int argc, char **argv )
urls = ch_strdup(newUrls);
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new urls from registry: %s\n", urls ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new urls from registry: %s\n", urls ));
#else
Debug(LDAP_DEBUG_ANY, "new urls from registry: %s\n",
urls, 0, 0);
@ -205,8 +205,8 @@ int main( int argc, char **argv )
{
configfile = newConfigFile;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new config file from registry is: %s\n", configfile ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: new config file from registry is: %s\n", configfile ));
#else
Debug ( LDAP_DEBUG_ANY, "new config file from registry is: %s\n", configfile, 0, 0 );
#endif
@ -231,7 +231,7 @@ int main( int argc, char **argv )
case 'h': /* listen URLs */
if ( urls != NULL ) free( urls );
urls = ch_strdup( optarg );
break;
break;
case 'd': /* set debug level and 'do not detach' flag */
no_detach = 1;
@ -292,7 +292,7 @@ int main( int argc, char **argv )
}
#ifdef NEW_LOGGING
lutil_log_initialize( argc, argv );
lutil_log_initialize( argc, argv );
#endif
lutil_set_debug_level( "slapd", slap_debug );
@ -301,8 +301,8 @@ int main( int argc, char **argv )
ldif_debug = slap_debug;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"%s", Versionstr ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"%s", Versionstr ));
#else
Debug( LDAP_DEBUG_TRACE, "%s", Versionstr, 0, 0 );
#endif
@ -367,8 +367,8 @@ int main( int argc, char **argv )
if ( schema_init( ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: schema initialization error\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: schema initialization error\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"schema initialization error\n",
@ -386,8 +386,8 @@ int main( int argc, char **argv )
if ( schema_prep( ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: schema prep error\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: schema prep error\n"));
#else
Debug( LDAP_DEBUG_ANY,
"schema prep error\n",
@ -444,8 +444,8 @@ int main( int argc, char **argv )
FILE *fp;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: slapd starting.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"main: slapd starting.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "slapd starting\n", 0, 0, 0 );
#endif
@ -503,8 +503,8 @@ stop:
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: slapd stopped.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_CRIT,
"main: slapd stopped.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "slapd stopped.\n", 0, 0, 0 );
#endif
@ -567,20 +567,20 @@ wait4child( int sig )
static int
cnvt_str2int( char *stringVal, STRDISP_P dispatcher, int defaultVal )
{
int retVal = defaultVal;
int retVal = defaultVal;
STRDISP_P disp;
for (disp = dispatcher; disp->stringVal; disp++) {
if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
if (!strncasecmp (stringVal, disp->stringVal, disp->abbr)) {
retVal = disp->intVal;
break;
retVal = disp->intVal;
break;
}
}
}
return (retVal);
}
#endif /* LOG_LOCAL4 */
#endif /* LOG_LOCAL4 */

54
servers/slapd/modify.c
View file

@ -48,8 +48,8 @@ do_modify(
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_modify: enter\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_modify: enter\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
#endif
@ -76,8 +76,8 @@ do_modify(
if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: ber_scanf failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: ber_scanf failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modify: ber_scanf failed\n", 0, 0, 0 );
#endif
@ -88,8 +88,8 @@ do_modify(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_modify: dn (%s)\n", dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_modify: dn (%s)\n", dn ));
#else
Debug( LDAP_DEBUG_ARGS, "do_modify: dn (%s)\n", dn, 0, 0 );
#endif
@ -119,9 +119,9 @@ do_modify(
case LDAP_MOD_ADD:
if ( (*modtail)->ml_bvalues == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: modify/add operation (%ld) requires values\n",
(long)mop ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: modify/add operation (%ld) requires values\n",
(long)mop ));
#else
Debug( LDAP_DEBUG_ANY,
"do_modify: modify/add operation (%ld) requires values\n",
@ -143,9 +143,9 @@ do_modify(
default: {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: invalid modify operation (%ld)\n",
(long)mop ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: invalid modify operation (%ld)\n",
(long)mop ));
#else
Debug( LDAP_DEBUG_ANY,
"do_modify: invalid modify operation (%ld)\n",
@ -166,8 +166,8 @@ do_modify(
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: get_ctrls failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: get_ctrls failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modify: get_ctrls failed\n", 0, 0, 0 );
#endif
@ -179,8 +179,8 @@ do_modify(
if( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: invalid dn (%s)\n", dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: invalid dn (%s)\n", dn ));
#else
Debug( LDAP_DEBUG_ANY, "do_modify: invalid dn (%s)\n", dn, 0, 0 );
#endif
@ -192,8 +192,8 @@ do_modify(
if( ndn == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: attempt to modify root DSE.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modify: attempt to modify root DSE.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modify: root dse!\n", 0, 0, 0 );
#endif
@ -205,18 +205,18 @@ do_modify(
#ifdef LDAP_DEBUG
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_modify: modifications:\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"do_modify: modifications:\n" ));
#else
Debug( LDAP_DEBUG_ARGS, "modifications:\n", 0, 0, 0 );
#endif
for ( tmp = modlist; tmp != NULL; tmp = tmp->ml_next ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"\t%s: %s\n", tmp->ml_op == LDAP_MOD_ADD ?
"add" : (tmp->ml_op == LDAP_MOD_DELETE ?
"delete" : "replace"), tmp->ml_type ));
LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
"\t%s: %s\n", tmp->ml_op == LDAP_MOD_ADD ?
"add" : (tmp->ml_op == LDAP_MOD_DELETE ?
"delete" : "replace"), tmp->ml_type ));
#else
Debug( LDAP_DEBUG_ARGS, "\t%s: %s\n",
tmp->ml_op == LDAP_MOD_ADD
@ -407,9 +407,9 @@ int slap_modlist2mods(
if( !validate ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"modlist2mods: no validator for syntax %S\n",
ad->ad_type->sat_syntax->ssyn_oid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"modlist2mods: no validator for syntax %S\n",
ad->ad_type->sat_syntax->ssyn_oid ));
#else
Debug( LDAP_DEBUG_TRACE,
"modlist2mods: no validator for syntax %s\n",

52
servers/slapd/modrdn.c
View file

@ -49,7 +49,7 @@ do_modrdn(
Backend *be;
/* Vars for LDAP v3 newSuperior support */
char *newSuperior = NULL;
char *nnewSuperior = NULL;
char *nnewSuperior = NULL;
Backend *newSuperior_be = NULL;
ber_len_t length;
int rc;
@ -57,8 +57,8 @@ do_modrdn(
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_modrdn: begin\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_modrdn: begin\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "do_modrdn\n", 0, 0, 0 );
#endif
@ -78,8 +78,8 @@ do_modrdn(
if ( ber_scanf( op->o_ber, "{aab", &dn, &newrdn, &deloldrdn )
== LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
@ -97,8 +97,8 @@ do_modrdn(
* newSuperior is present: report error.
*/
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: (v2) invalid field newSuperior.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: (v2) invalid field newSuperior.\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"modrdn(v2): invalid field newSuperior!\n",
@ -115,8 +115,8 @@ do_modrdn(
== LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf(\"a\") failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf(\"a\") failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf(\"a\") failed\n",
0, 0, 0 );
@ -132,8 +132,8 @@ do_modrdn(
if( dn_normalize( nnewSuperior ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid new superior (%s)\n", newSuperior ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid new superior (%s)\n", newSuperior ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid new superior (%s)\n",
newSuperior, 0, 0 );
@ -147,9 +147,9 @@ do_modrdn(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n",
dn, newrdn, newSuperior != NULL ? newSuperior : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_modrdn: dn (%s) newrdn (%s) newsuperior(%s)\n",
dn, newrdn, newSuperior != NULL ? newSuperior : "" ));
#else
Debug( LDAP_DEBUG_ARGS,
"do_modrdn: dn (%s) newrdn (%s) newsuperior (%s)\n",
@ -160,8 +160,8 @@ do_modrdn(
if ( ber_scanf( op->o_ber, /*{*/ "}") == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: ber_scanf failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: ber_scanf failed\n", 0, 0, 0 );
#endif
@ -174,13 +174,13 @@ do_modrdn(
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: get_ctrls failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: get_ctrls failed\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: get_ctrls failed\n", 0, 0, 0 );
#endif
/* get_ctrls has sent results. Now clean up. */
/* get_ctrls has sent results. Now clean up. */
goto cleanup;
}
@ -188,8 +188,8 @@ do_modrdn(
if( dn_normalize( ndn ) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid dn (%s)\n", dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid dn (%s)\n", dn ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid dn (%s)\n", dn, 0, 0 );
#endif
@ -201,8 +201,8 @@ do_modrdn(
if( !rdn_validate( newrdn ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid rdn (%s).\n", newrdn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: invalid rdn (%s).\n", newrdn ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: invalid rdn (%s)\n", newrdn, 0, 0 );
#endif
@ -214,8 +214,8 @@ do_modrdn(
if( ndn == '\0' ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: attempt to modify root DSE.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_modrdn: attempt to modify root DSE.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "do_modrdn: root dse!\n", 0, 0, 0 );
#endif
@ -299,7 +299,7 @@ do_modrdn(
#endif
) {
struct replog_moddn moddn;
moddn.newrdn = newrdn;
moddn.newrdn = newrdn;
moddn.deloldrdn = deloldrdn;
moddn.newsup = newSuperior;

48
servers/slapd/module.c
View file

@ -41,8 +41,8 @@ int module_init (void)
if (lt_dlinit()) {
const char *error = lt_dlerror();
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_init: lt_ldinit failed: %s\n", error ));
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_init: lt_ldinit failed: %s\n", error ));
#else
Debug(LDAP_DEBUG_ANY, "lt_dlinit failed: %s\n", error, 0, 0);
#endif
@ -62,8 +62,8 @@ int module_kill (void)
if (lt_dlexit()) {
const char *error = lt_dlerror();
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_kill: lt_dlexit failed: %s\n", error ));
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_kill: lt_dlexit failed: %s\n", error ));
#else
Debug(LDAP_DEBUG_ANY, "lt_dlexit failed: %s\n", error, 0, 0);
#endif
@ -83,8 +83,8 @@ int module_load(const char* file_name, int argc, char *argv[])
module = (module_loaded_t *)ch_calloc(1, sizeof(module_loaded_t));
if (module == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_load: (%s) out of memory.\n", file_name ));
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_load: (%s) out of memory.\n", file_name ));
#else
Debug(LDAP_DEBUG_ANY, "module_load failed: (%s) out of memory\n", file_name,
0, 0);
@ -101,9 +101,9 @@ int module_load(const char* file_name, int argc, char *argv[])
if ((module->lib = lt_dlopen(file_name)) == NULL) {
error = lt_dlerror();
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_load: lt_dlopen failed: (%s) %s.\n",
file_name, error ));
LDAP_LOG(( "module", LDAP_LEVEL_CRIT,
"module_load: lt_dlopen failed: (%s) %s.\n",
file_name, error ));
#else
Debug(LDAP_DEBUG_ANY, "lt_dlopen failed: (%s) %s\n", file_name,
error, 0);
@ -114,8 +114,8 @@ int module_load(const char* file_name, int argc, char *argv[])
}
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_INFO,
"module_load: loaded module %s\n", file_name ));
LDAP_LOG(( "module", LDAP_LEVEL_INFO,
"module_load: loaded module %s\n", file_name ));
#else
Debug(LDAP_DEBUG_CONFIG, "loaded module %s\n", file_name, 0, 0);
#endif
@ -123,9 +123,9 @@ int module_load(const char* file_name, int argc, char *argv[])
if ((initialize = lt_dlsym(module->lib, "init_module")) == NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s : no init_module() function found\n",
file_name ));
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s : no init_module() function found\n",
file_name ));
#else
Debug(LDAP_DEBUG_CONFIG, "module %s: no init_module() function found\n",
file_name, 0, 0);
@ -154,8 +154,8 @@ int module_load(const char* file_name, int argc, char *argv[])
rc = initialize(argc, argv);
if (rc == -1) {
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s init_module() failed\n", file_name));
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s init_module() failed\n", file_name));
#else
Debug(LDAP_DEBUG_CONFIG, "module %s: init_module() failed\n",
file_name, 0, 0);
@ -170,8 +170,8 @@ int module_load(const char* file_name, int argc, char *argv[])
|| module_regtable[rc].proc == NULL)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s: unknown registration type (%d).\n", file_name));
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s: unknown registration type (%d).\n", file_name));
#else
Debug(LDAP_DEBUG_CONFIG, "module %s: unknown registration type (%d)\n",
file_name, rc, 0);
@ -184,9 +184,9 @@ int module_load(const char* file_name, int argc, char *argv[])
rc = (module_regtable[rc].proc)(module, file_name);
if (rc != 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s:%s could not be registered.\n",
file_name, module_regtable[rc].type ));
LDAP_LOG(( "module", LDAP_LEVEL_ERR,
"module_load: module %s:%s could not be registered.\n",
file_name, module_regtable[rc].type ));
#else
Debug(LDAP_DEBUG_CONFIG, "module %s: %s module could not be registered\n",
file_name, module_regtable[rc].type, 0);
@ -200,9 +200,9 @@ int module_load(const char* file_name, int argc, char *argv[])
module_list = module;
#ifdef NEW_LOGGING
LDAP_LOG(( "module", LDAP_LEVEL_INFO,
"module_load: module %s:%s registered\n", file_name,
module_regtable[rc].type ));
LDAP_LOG(( "module", LDAP_LEVEL_INFO,
"module_load: module %s:%s registered\n", file_name,
module_regtable[rc].type ));
#else
Debug(LDAP_DEBUG_CONFIG, "module %s: %s module registered\n",
file_name, module_regtable[rc].type, 0);

26
servers/slapd/mr.c
View file

@ -36,7 +36,7 @@ mr_index_cmp(
static int
mr_index_name_cmp(
char *name,
char *name,
struct mindexrec *mir
)
{
@ -49,7 +49,7 @@ mr_find( const char *mrname )
struct mindexrec *mir = NULL;
if ( (mir = (struct mindexrec *) avl_find( mr_index, mrname,
(AVL_CMP) mr_index_name_cmp )) != NULL ) {
(AVL_CMP) mr_index_name_cmp )) != NULL ) {
return( mir->mir_mr );
}
return( NULL );
@ -169,8 +169,8 @@ register_matching_rule(
if( usage == SLAP_MR_NONE ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s not usable\n", desc ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s not usable\n", desc ));
#else
Debug( LDAP_DEBUG_ANY, "register_matching_rule: not usable %s\n",
desc, 0, 0 );
@ -187,9 +187,9 @@ register_matching_rule(
if( amr == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: could not locate associated matching rule %s for %s\n",
associated, desc ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: could not locate associated matching rule %s for %s\n",
associated, desc ));
#else
Debug( LDAP_DEBUG_ANY, "register_matching_rule: could not locate "
"associated matching rule %s for %s\n",
@ -205,9 +205,9 @@ register_matching_rule(
mr = ldap_str2matchingrule( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
if ( !mr ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s before %s in %s.\n",
ldap_scherr2str(code), err, desc ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s before %s in %s.\n",
ldap_scherr2str(code), err, desc ));
#else
Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s before %s in %s\n",
ldap_scherr2str(code), err, desc );
@ -224,9 +224,9 @@ register_matching_rule(
if ( code ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s for %s in %s.\n",
scherr2str(code), err, desc ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"register_matching_rule: %s for %s in %s.\n",
scherr2str(code), err, desc ));
#else
Debug( LDAP_DEBUG_ANY, "Error in register_matching_rule: %s for %s in %s\n",
scherr2str(code), err, desc );

32
servers/slapd/mra.c
View file

@ -52,8 +52,8 @@ get_mra(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"{t\") failure\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"{t\") failure\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
#endif
@ -67,8 +67,8 @@ get_mra(
rc = ber_scanf( ber, "a", &ma->ma_rule_text );
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf(\"a\") failure.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf(\"a\") failure.\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for mr\n", 0, 0, 0 );
#endif
@ -83,8 +83,8 @@ get_mra(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"t\") failure\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"t\") failure\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
#endif
@ -99,8 +99,8 @@ get_mra(
rc = ber_scanf( ber, "o", &type );
if ( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"o\") failure.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"o\") failure.\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf for ad\n", 0, 0, 0 );
#endif
@ -122,8 +122,8 @@ get_mra(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"t\") failure.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"t\") failure.\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
#endif
@ -136,8 +136,8 @@ get_mra(
if ( tag != LDAP_FILTER_EXT_VALUE ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf missing value\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf missing value\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf missing value\n", 0, 0, 0 );
#endif
@ -151,8 +151,8 @@ get_mra(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"o\") failure.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf (\"o\") failure.\n" ));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
#endif
@ -187,8 +187,8 @@ get_mra(
if( rc == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf failure\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"get_mra: ber_scanf failure\n"));
#else
Debug( LDAP_DEBUG_ANY, " get_mra ber_scanf\n", 0, 0, 0 );
#endif

6
servers/slapd/oc.c
View file

@ -67,9 +67,9 @@ int is_entry_objectclass(
if( attr == NULL ) {
/* no objectClass attribute */
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"is_entry_objectclass: dn(%s), oid (%s), no objectlcass attribute.\n",
e->e_dn == NULL ? "" : e->e_dn, oc->soc_oclass.oc_oid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"is_entry_objectclass: dn(%s), oid (%s), no objectlcass attribute.\n",
e->e_dn == NULL ? "" : e->e_dn, oc->soc_oclass.oc_oid ));
#else
Debug( LDAP_DEBUG_ANY, "is_entry_objectclass(\"%s\", \"%s\") "
"no objectClass attribute\n",

6
servers/slapd/operation.c
View file

@ -97,9 +97,9 @@ slap_op_remove( Operation **olist, Operation *op )
if ( *tmp == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_op_remove: can't find op %ld.\n",
(long)op->o_msgid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_op_remove: can't find op %ld.\n",
(long)op->o_msgid ));
#else
Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
(long) op->o_msgid, 0, 0 );

42
servers/slapd/passwd.c
View file

@ -83,8 +83,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( ber == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ber_init failed\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ber_init failed\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ber_init failed\n",
0, 0, 0 );
@ -103,8 +103,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_ID ) {
if( id == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID not allowed.\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID not allowed.\n"));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID not allowed.\n",
0, 0, 0 );
@ -119,8 +119,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID parse failed.\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID parse failed.\n"));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
@ -135,8 +135,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
if( oldpass == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: OLD not allowed.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: OLD not allowed.\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
0, 0, 0 );
@ -151,8 +151,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID parse failed.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: ID parse failed.\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
0, 0, 0 );
@ -167,8 +167,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
if( newpass == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: NEW not allowed.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: NEW not allowed.\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
0, 0, 0 );
@ -183,8 +183,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( tag == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: OLD parse failed.\n"));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: OLD parse failed.\n"));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
0, 0, 0 );
@ -199,8 +199,8 @@ int slap_passwd_parse( struct berval *reqdata,
if( len != 0 ) {
decoding_error:
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: decoding error, len=%ld\n", (long)len ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"slap_passwd_parse: decoding error, len=%ld\n", (long)len ));
#else
Debug( LDAP_DEBUG_TRACE,
"slap_passwd_parse: decoding error, len=%ld\n",
@ -244,8 +244,8 @@ struct berval * slap_passwd_return(
assert( cred != NULL );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"slap_passwd_return: %ld\n",(long)cred->bv_len ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"slap_passwd_return: %ld\n",(long)cred->bv_len ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_return: %ld\n",
(long) cred->bv_len, 0, 0 );
@ -275,7 +275,7 @@ slap_passwd_check(
Attribute *a,
struct berval *cred )
{
int i;
int i;
int result = 1;
#if defined( SLAPD_CRYPT ) || defined( SLAPD_SPASSWD )
@ -305,8 +305,8 @@ slap_passwd_check(
struct berval * slap_passwd_generate( void )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"slap_passwd_generate: begin\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"slap_passwd_generate: begin\n" ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_passwd_generate\n", 0, 0, 0 );
#endif

248
servers/slapd/result.c
View file

@ -215,9 +215,9 @@ static long send_ldap_ber(
*/
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_ber: conn %d ber_flush failed err=%d (%s)\n",
conn ? conn->c_connid : 0, err, sock_errstr(err) ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_ber: conn %d ber_flush failed err=%d (%s)\n",
conn ? conn->c_connid : 0, err, sock_errstr(err) ));
#else
Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
err, sock_errstr(err), 0 );
@ -273,9 +273,9 @@ send_ldap_response(
ber = ber_alloc_t( LBER_USE_DER );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_response: conn %d msgid=%ld tag=%ld err=%ld\n",
conn ? conn->c_connid : 0, (long)msgid, (long)tag, (long)err ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_response: conn %d msgid=%ld tag=%ld err=%ld\n",
conn ? conn->c_connid : 0, (long)msgid, (long)tag, (long)err ));
#else
Debug( LDAP_DEBUG_TRACE,
"send_ldap_response: msgid=%ld tag=%ld err=%ld\n",
@ -285,10 +285,10 @@ send_ldap_response(
if( ref ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_response: conn %d ref=\"%s\"\n",
conn ? conn->c_connid : 0,
ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_response: conn %d ref=\"%s\"\n",
conn ? conn->c_connid : 0,
ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=\"%s\"\n",
ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL",
@ -299,9 +299,9 @@ send_ldap_response(
if ( ber == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber_alloc failed\n",
conn ? conn->c_connid : 0 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber_alloc failed\n",
conn ? conn->c_connid : 0 ));
#else
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
#endif
@ -345,9 +345,9 @@ send_ldap_response(
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber_printf failed\n",
conn ? conn->c_connid : 0 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber_printf failed\n",
conn ? conn->c_connid : 0 ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -362,9 +362,9 @@ send_ldap_response(
if ( bytes < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber write failed\n",
conn ? conn->c_connid : 0 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber write failed\n",
conn ? conn->c_connid : 0 ));
#else
Debug( LDAP_DEBUG_ANY,
"send_ldap_response: ber write failed\n",
@ -402,9 +402,9 @@ send_ldap_disconnect(
assert( LDAP_UNSOLICITED_ERROR( err ) );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_disconnect: conn %d %d:%s\n",
conn ? conn->c_connid : 0, err, text ? text : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_disconnect: conn %d %d:%s\n",
conn ? conn->c_connid : 0, err, text ? text : "" ));
#else
Debug( LDAP_DEBUG_TRACE,
"send_ldap_disconnect %d:%s\n",
@ -451,9 +451,9 @@ send_ldap_result(
assert( !LDAP_API_ERROR( err ) );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_result : conn %ld op=%ld p=%d\n",
(long)op->o_connid, (long)op->o_opid, op->o_protocol ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_result : conn %ld op=%ld p=%d\n",
(long)op->o_connid, (long)op->o_opid, op->o_protocol ));
#else
Debug( LDAP_DEBUG_TRACE,
"send_ldap_result: conn=%ld op=%ld p=%d\n",
@ -461,21 +461,21 @@ send_ldap_result(
#endif
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_result: conn=%ld err=%d matched=\"%s\" text=\"%s\"\n",
(long)op->o_connid, err, matched ? matched : "", text ? text : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_result: conn=%ld err=%d matched=\"%s\" text=\"%s\"\n",
(long)op->o_connid, err, matched ? matched : "", text ? text : "" ));
#else
Debug( LDAP_DEBUG_ARGS,
"send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n",
err, matched ? matched : "", text ? text : "" );
err, matched ? matched : "", text ? text : "" );
#endif
if( ref ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_result: referral=\"%s\"\n",
ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"send_ldap_result: referral=\"%s\"\n",
ref[0] && ref[0]->bv_val ? ref[0]->bv_val : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS,
"send_ldap_result: referral=\"%s\"\n",
@ -538,9 +538,9 @@ send_ldap_sasl(
ber_int_t msgid;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_sasl: conn %d err=%ld len=%ld\n",
op->o_connid, (long)err, cred ? cred->bv_len : -1 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_sasl: conn %d err=%ld len=%ld\n",
op->o_connid, (long)err, cred ? cred->bv_len : -1 ));
#else
Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl: err=%ld len=%ld\n",
(long) err, cred ? cred->bv_len : -1, NULL );
@ -552,7 +552,7 @@ send_ldap_sasl(
send_ldap_response( conn, op, tag, msgid,
err, matched, text, ref,
NULL, NULL, cred, ctrls );
NULL, NULL, cred, ctrls );
}
void
@ -572,10 +572,10 @@ send_ldap_extended(
ber_int_t msgid;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_extended: conn %d err=%ld oid=%s len=%ld\n",
op->o_connid, (long)err, rspoid ? rspoid : "",
rspdata != NULL ? (long)rspdata->bv_len : (long)0 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_ldap_extended: conn %d err=%ld oid=%s len=%ld\n",
op->o_connid, (long)err, rspoid ? rspoid : "",
rspdata != NULL ? (long)rspdata->bv_len : (long)0 ));
#else
Debug( LDAP_DEBUG_TRACE,
"send_ldap_extended err=%ld oid=%s len=%ld\n",
@ -612,14 +612,14 @@ send_search_result(
assert( !LDAP_API_ERROR( err ) );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_result: conn %d err=%d matched=\"%s\"\n",
op->o_connid, err, matched ? matched : "",
text ? text : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_result: conn %d err=%d matched=\"%s\"\n",
op->o_connid, err, matched ? matched : "",
text ? text : "" ));
#else
Debug( LDAP_DEBUG_TRACE,
"send_search_result: err=%d matched=\"%s\" text=\"%s\"\n",
err, matched ? matched : "", text ? text : "" );
err, matched ? matched : "", text ? text : "" );
#endif
@ -679,17 +679,17 @@ send_search_entry(
BerElement *ber;
Attribute *a, *aa;
int i, rc=-1, bytes;
char *edn;
char *edn;
int userattrs;
int opattrs;
AttributeDescription *ad_entry = slap_schema.si_ad_entry;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_entry: conn %d dn=\"%s\"%s\n",
op->o_connid, e->e_dn,
attrsonly ? " (attrsOnly)" : "" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_entry: conn %d dn=\"%s\"%s\n",
op->o_connid, e->e_dn,
attrsonly ? " (attrsOnly)" : "" ));
#else
Debug( LDAP_DEBUG_TRACE,
"=> send_search_entry: dn=\"%s\"%s\n",
@ -701,9 +701,9 @@ send_search_entry(
ad_entry, NULL, ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to entry (%s) not allowed\n",
op->o_connid, e->e_dn ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to entry (%s) not allowed\n",
op->o_connid, e->e_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"send_search_entry: access to entry not allowed\n",
@ -719,9 +719,9 @@ send_search_entry(
if ( ber == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_alloc failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_alloc failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_alloc failed\n", 0, 0, 0 );
#endif
@ -736,9 +736,9 @@ send_search_entry(
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -783,9 +783,9 @@ send_search_entry(
if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to attribute %s not allowed\n",
op->o_connid, desc->ad_cname->bv_val ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to attribute %s not allowed\n",
op->o_connid, desc->ad_cname->bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
desc->ad_cname->bv_val, 0, 0 );
@ -796,9 +796,9 @@ send_search_entry(
if (( rc = ber_printf( ber, "{s[" /*]}*/ , type )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -815,13 +815,13 @@ send_search_entry(
desc, a->a_vals[i], ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to attribute %s, value %d not allowed\n",
op->o_connid, desc->ad_cname->bv_val, i ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to attribute %s, value %d not allowed\n",
op->o_connid, desc->ad_cname->bv_val, i ));
#else
Debug( LDAP_DEBUG_ACL,
"acl: access to attribute %s, value %d not allowed\n",
desc->ad_cname->bv_val, i, 0 );
desc->ad_cname->bv_val, i, 0 );
#endif
continue;
@ -829,9 +829,9 @@ send_search_entry(
if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed.\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed.\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"ber_printf failed\n", 0, 0, 0 );
@ -847,9 +847,9 @@ send_search_entry(
if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -890,9 +890,9 @@ send_search_entry(
if ( ! access_allowed( be, conn, op, e, desc, NULL, ACL_READ ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %s access to attribute %s not allowed\n",
op->o_connid, desc->ad_cname->bv_val ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %s access to attribute %s not allowed\n",
op->o_connid, desc->ad_cname->bv_val ));
#else
Debug( LDAP_DEBUG_ACL, "acl: access to attribute %s not allowed\n",
desc->ad_cname->bv_val, 0, 0 );
@ -904,9 +904,9 @@ send_search_entry(
rc = ber_printf( ber, "{s[" /*]}*/ , desc->ad_cname->bv_val );
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -923,13 +923,13 @@ send_search_entry(
desc, a->a_vals[i], ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to %s, value %d not allowed\n",
op->o_connid, desc->ad_cname->bv_val, i ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_entry: conn %d access to %s, value %d not allowed\n",
op->o_connid, desc->ad_cname->bv_val, i ));
#else
Debug( LDAP_DEBUG_ACL,
"acl: access to attribute %s, value %d not allowed\n",
desc->ad_cname->bv_val, i, 0 );
desc->ad_cname->bv_val, i, 0 );
#endif
continue;
@ -938,9 +938,9 @@ send_search_entry(
if (( rc = ber_printf( ber, "O", a->a_vals[i] )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"ber_printf failed\n", 0, 0, 0 );
@ -956,9 +956,9 @@ send_search_entry(
if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -976,9 +976,9 @@ send_search_entry(
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_entry: conn %d ber_printf failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 );
#endif
@ -994,9 +994,9 @@ send_search_entry(
if ( bytes < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber write failed.\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_ldap_response: conn %d ber write failed.\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"send_ldap_response: ber write failed\n",
@ -1016,9 +1016,9 @@ send_search_entry(
(long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_entry: conn %d exit.\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_entry: conn %d exit.\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 );
#endif
@ -1050,9 +1050,9 @@ send_search_reference(
AttributeDescription *ad_entry = slap_schema.si_ad_entry;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_reference: conn %d dn=\"%s\"\n",
op->o_connid, e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_reference: conn %d dn=\"%s\"\n",
op->o_connid, e->e_dn ));
#else
Debug( LDAP_DEBUG_TRACE,
"=> send_search_reference: dn=\"%s\"\n",
@ -1064,9 +1064,9 @@ send_search_reference(
ad_entry, NULL, ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_reference: conn %d access to entry %s not allowed\n",
op->o_connid, e->e_dn ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_reference: conn %d access to entry %s not allowed\n",
op->o_connid, e->e_dn ));
#else
Debug( LDAP_DEBUG_ACL,
"send_search_reference: access to entry not allowed\n",
@ -1080,9 +1080,9 @@ send_search_reference(
ad_ref, NULL, ACL_READ ) )
{
#ifdef NEW_LOGGING
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_reference: conn %d access to reference not allowed.\n",
op->o_connid ));
LDAP_LOG(( "acl", LDAP_LEVEL_INFO,
"send_search_reference: conn %d access to reference not allowed.\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ACL,
"send_search_reference: access to reference not allowed\n",
@ -1094,9 +1094,9 @@ send_search_reference(
if( refs == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: null ref in (%s).\n",
op->o_connid, e->e_dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: null ref in (%s).\n",
op->o_connid, e->e_dn ));
#else
Debug( LDAP_DEBUG_ANY,
"send_search_reference: null ref in (%s)\n",
@ -1118,9 +1118,9 @@ send_search_reference(
if ( ber == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: conn %d ber_alloc failed\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: conn %d ber_alloc failed\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"send_search_reference: ber_alloc failed\n", 0, 0, 0 );
@ -1136,9 +1136,9 @@ send_search_reference(
if ( rc == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: conn %d ber_printf failed.\n",
op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"send_search_reference: conn %d ber_printf failed.\n",
op->o_connid ));
#else
Debug( LDAP_DEBUG_ANY,
"send_search_reference: ber_printf failed\n", 0, 0, 0 );
@ -1163,8 +1163,8 @@ send_search_reference(
(long) conn->c_connid, (long) op->o_opid, e->e_dn, 0, 0 );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_reference: conn %d exit.\n", op->o_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"send_search_reference: conn %d exit.\n", op->o_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
#endif
@ -1191,8 +1191,8 @@ str2result(
if ( strncasecmp( s, "RESULT", 6 ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2result: (%s), expecting \"RESULT\"\n", s ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2result: (%s), expecting \"RESULT\"\n", s ));
#else
Debug( LDAP_DEBUG_ANY, "str2result (%s) expecting \"RESULT\"\n",
s, 0, 0 );
@ -1226,8 +1226,8 @@ str2result(
}
} else {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2result: (%s) unknown.\n", s ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"str2result: (%s) unknown.\n", s ));
#else
Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n",
s, 0, 0 );

106
servers/slapd/sasl.c
View file

@ -60,10 +60,10 @@ slap_sasl_log(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"SASL [conn=%d] %s: %s\n",
conn ? conn->c_connid : -1,
label, message ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"SASL [conn=%d] %s: %s\n",
conn ? conn->c_connid : -1,
label, message ));
#else
Debug( level, "SASL [conn=%d] %s: %s\n",
conn ? conn->c_connid: -1,
@ -89,10 +89,10 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_getdn: conn %d id=%s\n",
conn ? conn->c_connid : -1,
id ? (*id ? id : "<empty>") : "NULL" ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_getdn: conn %d id=%s\n",
conn ? conn->c_connid : -1,
id ? (*id ? id : "<empty>") : "NULL" ));
#else
Debug( LDAP_DEBUG_ARGS, "slap_sasl_getdn: id=%s\n",
id?(*id?id:"<empty>"):"NULL",0,0 );
@ -136,8 +136,8 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
rc = sasl_getprop( ctx, SASL_REALM, (void **)&c );
if( rc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_getdn: getprop(REALM) failed.\n" ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_getdn: getprop(REALM) failed.\n" ));
#else
Debug(LDAP_DEBUG_TRACE,
"getdn: getprop(REALM) failed!\n", 0,0,0);
@ -169,8 +169,8 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
strcpy( dn+len, ",cn=authzid" );
len += len1;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"getdn: u:id converted to %s.\n", dn ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"getdn: u:id converted to %s.\n", dn ));
#else
Debug( LDAP_DEBUG_TRACE, "getdn: u:id converted to %s\n", dn,0,0 );
#endif
@ -191,8 +191,8 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
ch_free( c1 );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_getdn: dn:id converted to %s.\n", dn ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_getdn: dn:id converted to %s.\n", dn ));
#else
Debug( LDAP_DEBUG_TRACE, "getdn: dn:id converted to %s\n", dn,0,0 );
#endif
@ -200,7 +200,7 @@ int slap_sasl_getdn( Connection *conn, char *id, char **dnptr, int flags )
}
}
if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
if( ( flags & FLAG_GETDN_FINAL ) == 0 ) {
dn_normalize( dn );
}
@ -225,11 +225,11 @@ slap_sasl_authorize(
*user = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sas_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n",
conn ? conn->c_connid : -1,
authcid ? authcid : "<empty>",
authzid ? authzid : "<empty>" ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sas_authorize: conn %d authcid=\"%s\" authzid=\"%s\"\n",
conn ? conn->c_connid : -1,
authcid ? authcid : "<empty>",
authzid ? authzid : "<empty>" ));
#else
Debug( LDAP_DEBUG_ARGS, "SASL Authorize [conn=%ld]: "
"authcid=\"%s\" authzid=\"%s\"\n",
@ -248,9 +248,9 @@ slap_sasl_authorize(
}
if( ( authzid == NULL ) || !strcmp( authcid,authzid ) ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d Using authcDN=%s\n",
conn ? conn->c_connid : -1, authcDN ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d Using authcDN=%s\n",
conn ? conn->c_connid : -1, authcDN ));
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
"Using authcDN=%s\n", (long) (conn ? conn->c_connid : -1), authcDN,0 );
@ -270,9 +270,9 @@ slap_sasl_authorize(
rc = slap_sasl_authorized( authcDN, authzDN );
if( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_authorize: conn %ld authorization disallowed (%d)\n",
(long)(conn ? conn->c_connid : -1), rc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_authorize: conn %ld authorization disallowed (%d)\n",
(long)(conn ? conn->c_connid : -1), rc ));
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
" authorization disallowed (%d)\n",
@ -286,9 +286,9 @@ 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 ) );
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorize: conn %d authorization allowed\n",
(long)(conn ? conn->c_connid : -1 ) );
#else
Debug( LDAP_DEBUG_TRACE, "SASL Authorize [conn=%ld]: "
" authorization allowed\n",
@ -368,8 +368,8 @@ int slap_sasl_init( void )
if( rc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_init: init failed.\n" ));
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_init: init failed.\n" ));
#else
Debug( LDAP_DEBUG_ANY, "sasl_server_init failed\n",
0, 0, 0 );
@ -379,8 +379,8 @@ int slap_sasl_init( void )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_init: initialized!\n"));
LDAP_LOG(( "sasl", LDAP_LEVEL_INFO,
"slap_sasl_init: initialized!\n"));
#else
Debug( LDAP_DEBUG_TRACE, "slap_sasl_init: initialized!\n",
0, 0, 0 );
@ -444,8 +444,8 @@ int slap_sasl_open( Connection *conn )
if( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_open: sasl_server_new failed: %d\n", sc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_open: sasl_server_new failed: %d\n", sc ));
#else
Debug( LDAP_DEBUG_ANY, "sasl_server_new failed: %d\n",
sc, 0, 0 );
@ -462,8 +462,8 @@ int slap_sasl_open( Connection *conn )
if( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_open: sasl_setprop failed: %d \n", sc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_open: sasl_setprop failed: %d \n", sc ));
#else
Debug( LDAP_DEBUG_ANY, "sasl_setprop failed: %d\n",
sc, 0, 0 );
@ -537,8 +537,8 @@ char ** slap_sasl_mechs( Connection *conn )
if( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_mechs: sasl_listmech failed: %d\n", sc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_mechs: sasl_listmech failed: %d\n", sc ));
#else
Debug( LDAP_DEBUG_ANY, "slap_sasl_listmech failed: %d\n",
sc, 0, 0 );
@ -575,11 +575,11 @@ int slap_sasl_close( Connection *conn )
}
int slap_sasl_bind(
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
struct berval *cred,
Connection *conn,
Operation *op,
const char *dn,
const char *ndn,
struct berval *cred,
char **edn,
slap_ssf_t *ssfp )
{
@ -593,11 +593,11 @@ int slap_sasl_bind(
int sc;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%d\n",
conn->c_connid, dn,
conn->c_sasl_bind_in_progress ? "<continuing>" : conn->c_sasl_bind_mech,
cred ? cred->bv_len : 0 ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"sasl_bind: conn %ld dn=\"%s\" mech=%s datalen=%d\n",
conn->c_connid, dn,
conn->c_sasl_bind_in_progress ? "<continuing>" : conn->c_sasl_bind_mech,
cred ? cred->bv_len : 0 ));
#else
Debug(LDAP_DEBUG_ARGS,
"==> sasl_bind: dn=\"%s\" mech=%s datalen=%d\n", dn,
@ -634,8 +634,8 @@ int slap_sasl_bind(
if ( sc != SASL_OK ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_bind: getprop(USERNAME) failed: %d\n", sc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_bind: getprop(USERNAME) failed: %d\n", sc ));
#else
Debug(LDAP_DEBUG_TRACE,
"slap_sasl_bind: getprop(USERNAME) failed!\n",
@ -690,8 +690,8 @@ int slap_sasl_bind(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_bind: rc=%d\n", rc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_bind: rc=%d\n", rc ));
#else
Debug(LDAP_DEBUG_TRACE, "<== slap_sasl_bind: rc=%d\n", rc, 0, 0);
#endif

84
servers/slapd/saslauthz.c
View file

@ -30,7 +30,7 @@
/* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]] */
/* URI format: ldap://<host>/<base>[?[<attrs>][?[<scope>][?[<filter>]]]] */
int slap_parseURI( char *uri, char **searchbase, int *scope, Filter **filter )
{
@ -43,8 +43,8 @@ int slap_parseURI( char *uri, char **searchbase, int *scope, Filter **filter )
*filter = NULL;
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_parseURI: parsing %s\n", uri ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_parseURI: parsing %s\n", uri ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_parseURI: parsing %s\n", uri, 0, 0 );
#endif
@ -141,9 +141,9 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
rc = regcomp( &reg->workspace, reg->match, REG_EXTENDED|REG_ICASE );
if ( rc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_regexp_config: \"%s\" could not be compiled.\n"
reg->match ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_regexp_config: \"%s\" could not be compiled.\n"
reg->match ));
#else
Debug( LDAP_DEBUG_ANY,
"SASL match pattern %s could not be compiled by regexp engine\n",
@ -156,7 +156,7 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
/* Precompile replace pattern. Find the $<n> placeholders */
reg->offset[0] = -2;
n = 1;
for ( c = reg->replace; *c; c++ ) {
for ( c = reg->replace; *c; c++ ) {
if ( *c == '\\' ) {
c++;
continue;
@ -164,9 +164,9 @@ int slap_sasl_regexp_config( const char *match, const char *replace )
if ( *c == '$' ) {
if ( n == SASLREGEX_REPLACE ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_regexp_config: \"%s\" has too many $n placeholders (max %d)\n",
reg->replace, SASLREGEX_REPLACE ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ERR,
"slap_sasl_regexp_config: \"%s\" has too many $n placeholders (max %d)\n",
reg->replace, SASLREGEX_REPLACE ));
#else
Debug( LDAP_DEBUG_ANY,
"SASL replace pattern %s has too many $n placeholders (max %d)\n",
@ -210,8 +210,8 @@ char *slap_sasl_regexp( char *saslname )
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_regexp: converting SASL name %s\n", saslname ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_regexp: converting SASL name %s\n", saslname ));
#else
Debug( LDAP_DEBUG_TRACE, "slap_sasl_regexp: converting SASL name %s\n",
saslname, 0, 0 );
@ -248,7 +248,7 @@ char *slap_sasl_regexp( char *saslname )
break;
/* Len of string from saslname that matched next $i (b,d above) */
i = reg->replace[ reg->offset[n] + 1 ] - '0';
i = reg->replace[ reg->offset[n] + 1 ] - '0';
len += reg->strings[i].rm_eo - reg->strings[i].rm_so;
n++;
}
@ -266,7 +266,7 @@ char *slap_sasl_regexp( char *saslname )
break;
/* Paste in string from saslname that matched next $i (b,d above) */
i = reg->replace[ reg->offset[n] + 1 ] - '0';
i = reg->replace[ reg->offset[n] + 1 ] - '0';
len = reg->strings[i].rm_eo - reg->strings[i].rm_so;
strncpy( uri+insert, saslname + reg->strings[i].rm_so, len );
insert += len;
@ -276,8 +276,8 @@ char *slap_sasl_regexp( char *saslname )
uri[insert] = '\0';
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_regexp: converted SASL name to %s\n", uri ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_regexp: converted SASL name to %s\n", uri ));
#else
Debug( LDAP_DEBUG_TRACE,
"slap_sasl_regexp: converted SASL name to %s\n", uri, 0, 0 );
@ -311,8 +311,8 @@ char *slap_sasl2dn( char *saslname )
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl2dn: converting SASL name %s to DN.\n", saslname ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl2dn: converting SASL name %s to DN.\n", saslname ));
#else
Debug( LDAP_DEBUG_TRACE,
"==>slap_sasl2dn: Converting SASL name %s to a DN\n", saslname, 0,0 );
@ -337,9 +337,9 @@ char *slap_sasl2dn( char *saslname )
/* Must do an internal search */
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl2dn: performing internal search (base=%s, scope=%s)\n",
searchbase, scope ));
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl2dn: performing internal search (base=%s, scope=%s)\n",
searchbase, scope ));
#else
Debug( LDAP_DEBUG_TRACE,
"slap_sasl2dn: performing internal search (base=%s, scope=%d)\n",
@ -369,8 +369,8 @@ char *slap_sasl2dn( char *saslname )
/* Make sure exactly one entry was returned */
rc = ldap_count_entries( client, res );
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl2dn: search DN returned %d entries\n", rc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl2dn: search DN returned %d entries\n", rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"slap_sasl2dn: search DN returned %d entries\n", rc,0,0 );
@ -391,8 +391,8 @@ FINISHED:
if( client ) ldap_unbind( client );
if( DN ) dn_normalize( DN );
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl2dn: Converted SASL name to %s\n", DN ? DN : "<nothing>" ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl2dn: Converted SASL name to %s\n", DN ? DN : "<nothing>" ));
#else
Debug( LDAP_DEBUG_TRACE, "<==slap_sasl2dn: Converted SASL name to %s\n",
DN ? DN : "<nothing>", 0, 0 );
@ -428,8 +428,8 @@ 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 );
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"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 );
@ -458,9 +458,9 @@ int slap_sasl_match( char *rule, char *assertDN, char *authc )
/* Must run an internal search. */
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl_match: performing internal search (base=%s, scope=%d)\n",
searchbase, scope ));
LDAP_LOG(( "sasl", LDAP_LEVEL_DETAIL1,
"slap_sasl_match: performing internal search (base=%s, scope=%d)\n",
searchbase, scope ));
#else
Debug( LDAP_DEBUG_TRACE,
"slap_sasl_match: performing internal search (base=%s, scope=%d)\n",
@ -512,8 +512,8 @@ CONCLUDED:
if( res ) ldap_msgfree( res );
if( client ) ldap_unbind( client );
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_match: comparison returned %d\n", rc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_match: comparison returned %d\n", rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"<===slap_sasl_match: comparison returned %d\n", rc, 0, 0);
@ -545,9 +545,9 @@ slap_sasl_check_authz(char *searchDN, char *assertDN, char *attr, char *authc)
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_check_authz: does %s match %s rule in %s?\n",
assertDN, attr, searchDN ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_check_authz: does %s match %s rule in %s?\n",
assertDN, attr, searchDN ));
#else
Debug( LDAP_DEBUG_TRACE,
"==>slap_sasl_check_authz: does %s match %s rule in %s?\n",
@ -575,8 +575,8 @@ COMPLETE:
if( ad ) ad_free( ad, 1 );
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_check_authz: %s check returning %s\n", attr, rc ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_check_authz: %s check returning %s\n", attr, rc ));
#else
Debug( LDAP_DEBUG_TRACE,
"<==slap_sasl_check_authz: %s check returning %d\n", attr, rc, 0);
@ -587,7 +587,7 @@ COMPLETE:
#endif /* HAVE_CYRUS_SASL */
#endif /* HAVE_CYRUS_SASL */
@ -608,8 +608,8 @@ int slap_sasl_authorized( char *authcDN, char *authzDN )
}
#ifdef NEW_LOGGING
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorized: can %s become %s?\n", authcDN, authzDN ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorized: can %s become %s?\n", authcDN, authzDN ));
#else
Debug( LDAP_DEBUG_TRACE,
"==>slap_sasl_authorized: can %s become %s?\n", authcDN, authzDN, 0 );
@ -639,8 +639,8 @@ 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 ));
LDAP_LOG(( "sasl", LDAP_LEVEL_ENTRY,
"slap_sasl_authorized: return %s\n", rc ));
#else
Debug( LDAP_DEBUG_TRACE, "<== slap_sasl_authorized: return %d\n",rc,0,0 );
#endif

32
servers/slapd/schema_check.c
View file

@ -41,8 +41,8 @@ entry_schema_check(
/* find the object class attribute - could error out here */
if ( (aoc = attr_find( e->e_attrs, ad_objectClass )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: No objectClass for entry (%s).\n", e->e_dn ));
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: No objectClass for entry (%s).\n", e->e_dn ));
#else
Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
e->e_dn, 0, 0 );
@ -56,9 +56,9 @@ entry_schema_check(
for ( i = 0; aoc->a_vals[i] != NULL; i++ ) {
if ( (oc = oc_find( aoc->a_vals[i]->bv_val )) == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: dn (%s), objectClass \"%s\" not recognized\n",
e->e_dn, aoc->a_vals[i]->bv_val ));
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: dn (%s), objectClass \"%s\" not recognized\n",
e->e_dn, aoc->a_vals[i]->bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"entry_check_schema(%s): objectClass \"%s\" not recognized\n",
@ -73,9 +73,9 @@ entry_schema_check(
if (s != NULL) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: dn (%s) oc \"%s\" requires att \"%s\"\n",
e->e_dn, aoc->a_vals[i]->bv_val, s ));
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: dn (%s) oc \"%s\" requires att \"%s\"\n",
e->e_dn, aoc->a_vals[i]->bv_val, s ));
#else
Debug( LDAP_DEBUG_ANY,
"Entry (%s), oc \"%s\" requires attr \"%s\"\n",
@ -106,9 +106,9 @@ entry_schema_check(
if ( ret != 0 ) {
char *type = a->a_desc->ad_cname->bv_val;
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: Entry (%s) attr \"%s\" not allowed.\n",
e->e_dn, type ));
LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
"entry_schema_check: Entry (%s) attr \"%s\" not allowed.\n",
e->e_dn, type ));
#else
Debug( LDAP_DEBUG_ANY,
"Entry (%s), attr \"%s\" not allowed\n",
@ -132,9 +132,9 @@ oc_check_required( Entry *e, struct berval *ocname )
Attribute *a;
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"oc_check_required: dn (%s), objectClass \"%s\"\n",
e->e_dn, ocname->bv_val ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"oc_check_required: dn (%s), objectClass \"%s\"\n",
e->e_dn, ocname->bv_val ));
#else
Debug( LDAP_DEBUG_TRACE,
"oc_check_required entry (%s), objectClass \"%s\"\n",
@ -178,8 +178,8 @@ int oc_check_allowed(
int i, j;
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"oc_check_allowed: type \"%s\"\n", at->sat_cname ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"oc_check_allowed: type \"%s\"\n", at->sat_cname ));
#else
Debug( LDAP_DEBUG_TRACE,
"oc_check_allowed type \"%s\"\n",

68
servers/slapd/schema_init.c
View file

@ -56,13 +56,13 @@
/* approx matching rules */
#define directoryStringApproxMatchOID "1.3.6.1.4.1.4203.666.4.4"
#define directoryStringApproxMatch approxMatch
#define directoryStringApproxIndexer approxIndexer
#define directoryStringApproxFilter approxFilter
#define directoryStringApproxMatch approxMatch
#define directoryStringApproxIndexer approxIndexer
#define directoryStringApproxFilter approxFilter
#define IA5StringApproxMatchOID "1.3.6.1.4.1.4203.666.4.5"
#define IA5StringApproxMatch approxMatch
#define IA5StringApproxMatch approxMatch
#define IA5StringApproxIndexer approxIndexer
#define IA5StringApproxFilter approxFilter
#define IA5StringApproxFilter approxFilter
/* orderring matching rules */
#define caseIgnoreOrderingMatch caseIgnoreMatch
@ -133,7 +133,7 @@ int octetStringIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -187,7 +187,7 @@ int octetStringFilter(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value = (struct berval *) assertValue;
struct berval digest;
digest.bv_val = HASHdigest;
@ -290,9 +290,9 @@ dnMatch(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"dnMatch: %d\n %s\n %s\n", match,
value->bv_val, asserted->bv_val ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"dnMatch: %d\n %s\n %s\n", match,
value->bv_val, asserted->bv_val ));
#else
Debug( LDAP_DEBUG_ARGS, "dnMatch %d\n\t\"%s\"\n\t\"%s\"\n",
match, value->bv_val, asserted->bv_val );
@ -778,7 +778,7 @@ approxMatch(
/* Get a phonetic copy of each word */
words = (char **)ch_malloc( count * sizeof(char *) );
values = (char **)ch_malloc( count * sizeof(char *) );
for( c=val,i=0; i<count; i++,c+=strlen(c)+1 ) {
for( c=val,i=0; i<count; i++,c+=strlen(c)+1 ) {
words[i] = c;
values[i] = phonetic(c);
}
@ -868,7 +868,7 @@ approxIndexer(
/* Isolate how many words there are. There will be a key for each */
val = ch_strdup( values[j]->bv_val );
for( wordcount=0,c=val; *c; c++) {
for( wordcount=0,c=val; *c; c++) {
len = strcspn(c, SLAPD_APPROX_DELIMITER);
if( len >= SLAPD_APPROX_WORDLEN ) wordcount++;
c+= len;
@ -884,7 +884,7 @@ approxIndexer(
keys = newkeys;
/* Get a phonetic copy of each word */
for( c=val,i=0; i<wordcount; c+=len+1 ) {
for( c=val,i=0; i<wordcount; c+=len+1 ) {
len = strlen( c );
if( len < SLAPD_APPROX_WORDLEN ) continue;
keys[keycount] = (struct berval *)ch_malloc( sizeof(struct berval) );
@ -932,7 +932,7 @@ approxFilter(
keys = (struct berval **)ch_malloc( (count + 1) * sizeof(struct berval *) );
/* Get a phonetic copy of each word */
for( c=val,i=0; i<count; c+=len+1 ) {
for( c=val,i=0; i<count; c+=len+1 ) {
len = strlen(c);
if( len < SLAPD_APPROX_WORDLEN ) continue;
keys[i] = (struct berval *)ch_malloc( sizeof(struct berval) );
@ -1196,7 +1196,7 @@ int caseExactIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -1250,7 +1250,7 @@ int caseExactFilter(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
digest.bv_val = HASHdigest;
@ -1297,7 +1297,7 @@ int caseExactSubstringsIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -1459,7 +1459,7 @@ int caseExactSubstringsFilter(
size_t slen, mlen, klen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
@ -1793,7 +1793,7 @@ int caseIgnoreIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -1850,7 +1850,7 @@ int caseIgnoreFilter(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
digest.bv_val = HASHdigest;
@ -1901,7 +1901,7 @@ int caseIgnoreSubstringsIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -2067,7 +2067,7 @@ int caseIgnoreSubstringsFilter(
size_t slen, mlen, klen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
@ -2619,7 +2619,7 @@ int caseExactIA5Indexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -2673,7 +2673,7 @@ int caseExactIA5Filter(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
digest.bv_val = HASHdigest;
@ -2720,7 +2720,7 @@ int caseExactIA5SubstringsIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -2882,7 +2882,7 @@ int caseExactIA5SubstringsFilter(
size_t slen, mlen, klen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
@ -3185,7 +3185,7 @@ int caseIgnoreIA5Indexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -3242,7 +3242,7 @@ int caseIgnoreIA5Filter(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
digest.bv_val = HASHdigest;
@ -3293,7 +3293,7 @@ int caseIgnoreIA5SubstringsIndexer(
size_t slen, mlen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval digest;
digest.bv_val = HASHdigest;
digest.bv_len = sizeof(HASHdigest);
@ -3459,7 +3459,7 @@ int caseIgnoreIA5SubstringsFilter(
size_t slen, mlen, klen;
struct berval **keys;
HASH_CONTEXT HASHcontext;
unsigned char HASHdigest[HASH_BYTES];
unsigned char HASHdigest[HASH_BYTES];
struct berval *value;
struct berval digest;
@ -3743,9 +3743,9 @@ objectIdentifierFirstComponentMatch(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"objectIdentifierFirstComponentMatch: %d\n %s\n %s\n",
match, value->bv_val, asserted->bv_val ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"objectIdentifierFirstComponentMatch: %d\n %s\n %s\n",
match, value->bv_val, asserted->bv_val ));
#else
Debug( LDAP_DEBUG_ARGS, "objectIdentifierFirstComponentMatch "
"%d\n\t\"%s\"\n\t\"%s\"\n",
@ -3884,7 +3884,7 @@ check_time_syntax (struct berval *val,
}
switch ( tzoffset ) {
case -1: /* negativ offset to UTC, ie west of Greenwich */
case -1: /* negativ offset to UTC, ie west of Greenwich */
parts[4] += parts[7];
parts[5] += parts[8];
for (part = 6; --part > 0; ) { /* offset is just hhmm, no seconds */

12
servers/slapd/schema_prep.c
View file

@ -61,9 +61,9 @@ objectClassMatch(
#if 0
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"objectClassMatch(%s, %s) = %d\n",
value->bv_val, a->bv_val, *matchp ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"objectClassMatch(%s, %s) = %d\n",
value->bv_val, a->bv_val, *matchp ));
#else
Debug( LDAP_DEBUG_TRACE, "objectClassMatch(%s,%s) = %d\n",
value->bv_val, a->bv_val, *matchp );
@ -110,9 +110,9 @@ structuralObjectClassMatch(
#if 0
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"structuralObjectClassMatch( %s, %s ) = %d\n",
value->bv_val, a->bv_val, *matchp ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"structuralObjectClassMatch( %s, %s ) = %d\n",
value->bv_val, a->bv_val, *matchp ));
#else
Debug( LDAP_DEBUG_TRACE, "structuralObjectClassMatch(%s,%s) = %d\n",
value->bv_val, a->bv_val, *matchp );

32
servers/slapd/search.c
View file

@ -27,7 +27,7 @@
int
do_search(
Connection *conn, /* where to send results */
Connection *conn, /* where to send results */
Operation *op /* info about the op to which we're responding */
) {
int i;
@ -42,8 +42,8 @@ do_search(
int manageDSAit;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_search: conn %d\n", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_search: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
#endif
@ -114,9 +114,9 @@ do_search(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search \"%s\" %d %d %d %d %d\n", base, scope,
deref, sizelimit, timelimit, attrsonly ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search \"%s\" %d %d %d %d %d\n", base, scope,
deref, sizelimit, timelimit, attrsonly ));
#else
Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base, scope, deref );
Debug( LDAP_DEBUG_ARGS, " %d %d %d\n", sizelimit, timelimit,
@ -137,8 +137,8 @@ do_search(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: conn %d filter: %s\n", conn->c_connid, fstr ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: conn %d filter: %s\n", conn->c_connid, fstr ));
#else
Debug( LDAP_DEBUG_ARGS, " filter: %s\n", fstr, 0, 0 );
#endif
@ -154,9 +154,9 @@ do_search(
if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_search: conn %d get_ctrls failed (%d)\n",
conn->c_connid, rc ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"do_search: conn %d get_ctrls failed (%d)\n",
conn->c_connid, rc ));
#else
Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
#endif
@ -167,8 +167,8 @@ do_search(
rc = 0;
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: conn %d attrs:", conn->c_connid ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: conn %d attrs:", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ARGS, " attrs:", 0, 0, 0 );
#endif
@ -177,8 +177,8 @@ do_search(
if ( attrs != NULL ) {
for ( i = 0; attrs[i] != NULL; i++ ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: %s", attrs[i] ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
"do_search: %s", attrs[i] ));
#else
Debug( LDAP_DEBUG_ARGS, " %s", attrs[i], 0, 0 );
#endif
@ -187,7 +187,7 @@ do_search(
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, "\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, "\n" ));
#else
Debug( LDAP_DEBUG_ARGS, "\n", 0, 0, 0 );
#endif

36
servers/slapd/str2filter.c
View file

@ -28,8 +28,8 @@ str2filter( const char *str )
char *end, *freeme;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2filter: \"%s\"\n", str ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2filter: \"%s\"\n", str ));
#else
Debug( LDAP_DEBUG_FILTER, "str2filter \"%s\"\n", str, 0, 0 );
#endif
@ -54,8 +54,8 @@ str2filter( const char *str )
switch ( *str ) {
case '&':
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: AND\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: AND\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "str2filter: AND\n",
0, 0, 0 );
@ -68,8 +68,8 @@ str2filter( const char *str )
case '|':
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: OR\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: OR\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "put_filter: OR\n",
0, 0, 0 );
@ -82,8 +82,8 @@ str2filter( const char *str )
case '!':
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: NOT\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: NOT\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "put_filter: NOT\n",
0, 0, 0 );
@ -96,8 +96,8 @@ str2filter( const char *str )
default:
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: simple\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: simple\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "str2filter: simple\n",
0, 0, 0 );
@ -112,8 +112,8 @@ str2filter( const char *str )
default: /* assume it's a simple type=value filter */
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: default\n" ));
LDAP_LOG(( "filter", LDAP_LEVEL_DETAIL1,
"str2filter: default\n" ));
#else
Debug( LDAP_DEBUG_FILTER, "str2filter: default\n", 0, 0,
0 );
@ -141,8 +141,8 @@ str2list( const char *str, unsigned long ftype )
char save;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2list: \"%s\"\n", str ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2list: \"%s\"\n", str ));
#else
Debug( LDAP_DEBUG_FILTER, "str2list \"%s\"\n", str, 0, 0 );
#endif
@ -191,8 +191,8 @@ str2simple( const char *str )
const char *text;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2simple: \"%s\"\n", str ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2simple: \"%s\"\n", str ));
#else
Debug( LDAP_DEBUG_FILTER, "str2simple \"%s\"\n", str, 0, 0 );
#endif
@ -289,8 +289,8 @@ str2subvals( const char *in, Filter *f )
int gotstar;
#ifdef NEW_LOGGING
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2subvals: \"%s\"\n", in ));
LDAP_LOG(( "filter", LDAP_LEVEL_ENTRY,
"str2subvals: \"%s\"\n", in ));
#else
Debug( LDAP_DEBUG_FILTER, "str2subvals \"%s\"\n", in, 0, 0 );
#endif

8
servers/slapd/suffixalias.c
View file

@ -32,7 +32,7 @@ char *suffix_alias(
Backend *be,
char *dn )
{
int i, dnLength;
int i, dnLength;
if(dn == NULL) return NULL;
if(be == NULL) return dn;
@ -64,9 +64,9 @@ char *suffix_alias(
strncpy( dn, oldDN, diff );
strcpy( &dn[diff], be->be_suffixAlias[i+1] );
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"suffix_alias: converted \"%s\" to \"%s\"\n",
oldDN, dn ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"suffix_alias: converted \"%s\" to \"%s\"\n",
oldDN, dn ));
#else
Debug( LDAP_DEBUG_ARGS,
"suffix_alias: converted \"%s\" to \"%s\"\n",

22
servers/slapd/syntax.c
View file

@ -36,7 +36,7 @@ syn_index_cmp(
static int
syn_index_name_cmp(
char *name,
char *name,
struct sindexrec *sir
)
{
@ -49,7 +49,7 @@ syn_find( const char *synname )
struct sindexrec *sir = NULL;
if ( (sir = (struct sindexrec *) avl_find( syn_index, synname,
(AVL_CMP) syn_index_name_cmp )) != NULL ) {
(AVL_CMP) syn_index_name_cmp )) != NULL ) {
return( sir->sir_syn );
}
return( NULL );
@ -151,9 +151,9 @@ register_syntax(
syn = ldap_str2syntax( desc, &code, &err, LDAP_SCHEMA_ALLOW_ALL);
if ( !syn ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
"register_syntax: Error - %s before %s in %s.\n",
ldap_scherr2str(code), err, desc ));
LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
"register_syntax: Error - %s before %s in %s.\n",
ldap_scherr2str(code), err, desc ));
#else
Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s before %s in %s\n",
ldap_scherr2str(code), err, desc );
@ -168,9 +168,9 @@ register_syntax(
if ( code ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
"register_syntax: Error - %s %s in %s\n",
scherr2str(code), err, desc ));
LDAP_LOG(( "schema", LDAP_LEVEL_ERR,
"register_syntax: Error - %s %s in %s\n",
scherr2str(code), err, desc ));
#else
Debug( LDAP_DEBUG_ANY, "Error in register_syntax: %s %s in %s\n",
scherr2str(code), err, desc );
@ -213,9 +213,9 @@ syn_schema_info( Entry *e )
val.bv_len = strlen( val.bv_val );
#if 0
#ifdef NEW_LOGGING
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"syn_schema_info: Merging syn [%ld] %s\n",
(long)val.bv_len, val.bv_val ));
LDAP_LOG(( "schema", LDAP_LEVEL_ENTRY,
"syn_schema_info: Merging syn [%ld] %s\n",
(long)val.bv_len, val.bv_val ));
#else
Debug( LDAP_DEBUG_TRACE, "Merging syn [%ld] %s\n",
(long) val.bv_len, val.bv_val, 0 );

4
servers/slapd/unbind.c
View file

@ -34,8 +34,8 @@ do_unbind(
)
{
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_unbind: conn %d\n", conn ? conn->c_connid : -1 ));
LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
"do_unbind: conn %d\n", conn ? conn->c_connid : -1 ));
#else
Debug( LDAP_DEBUG_TRACE, "do_unbind\n", 0, 0, 0 );
#endif

32
servers/slapd/user.c
View file

@ -45,7 +45,7 @@ slap_init_user( char *user, char *group )
{
uid_t uid;
gid_t gid;
int got_uid = 0, got_gid = 0;
int got_uid = 0, got_gid = 0;
if ( user ) {
struct passwd *pwd;
@ -64,9 +64,9 @@ slap_init_user( char *user, char *group )
did_getpw:
if ( pwd == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: No passwd entry for user %s\n",
user ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: No passwd entry for user %s\n",
user ));
#else
Debug( LDAP_DEBUG_ANY, "No passwd entry for user %s\n",
user, 0, 0 );
@ -104,8 +104,8 @@ slap_init_user( char *user, char *group )
did_group:
if ( grp == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: No group entry for group %s\n", group));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: No group entry for group %s\n", group));
#else
Debug( LDAP_DEBUG_ANY, "No group entry for group %s\n",
group, 0, 0 );
@ -121,8 +121,8 @@ slap_init_user( char *user, char *group )
if ( user ) {
if ( getuid() == 0 && initgroups( user, gid ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set the group access (gid) list.\n" ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set the group access (gid) list.\n" ));
#else
Debug( LDAP_DEBUG_ANY,
"Could not set the group access (gid) list\n", 0, 0, 0 );
@ -140,8 +140,8 @@ slap_init_user( char *user, char *group )
if ( got_gid ) {
if ( setgid( gid ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: could not set real group id to %d\n", (int)gid));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: could not set real group id to %d\n", (int)gid));
#else
Debug( LDAP_DEBUG_ANY, "Could not set real group id to %d\n",
(int) gid, 0, 0 );
@ -152,8 +152,8 @@ slap_init_user( char *user, char *group )
#ifdef HAVE_SETEGID
if ( setegid( gid ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set effective group id to %d\n",(int)gid));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set effective group id to %d\n",(int)gid));
#else
Debug( LDAP_DEBUG_ANY, "Could not set effective group id to %d\n",
(int) gid, 0, 0 );
@ -167,8 +167,8 @@ slap_init_user( char *user, char *group )
if ( got_uid ) {
if ( setuid( uid ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set real user id to %d\n", (int)uid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set real user id to %d\n", (int)uid ));
#else
Debug( LDAP_DEBUG_ANY, "Could not set real user id to %d\n",
(int) uid, 0, 0 );
@ -179,8 +179,8 @@ slap_init_user( char *user, char *group )
#ifdef HAVE_SETEUID
if ( seteuid( uid ) != 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set effective user id to %d\n", (int)uid ));
LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
"slap_init_user: Could not set effective user id to %d\n", (int)uid ));
#else
Debug( LDAP_DEBUG_ANY, "Could not set effective user id to %d\n",
(int) uid, 0, 0 );