upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 01:59:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#8731 Apply doc/devel/variadic_debug/04-variadic.cocci

Browse source
This commit is contained in:
Ondřej Kuzník 2019-02-15 16:49:52 +00:00
parent 09cec1f1b4
commit 97a310b312
276 changed files with 3257 additions and 3507 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/slapd-modules/acl/gssacl.c
View file

@ -307,10 +307,10 @@ regex_matches(
regfree( &re );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: string: %s\n", str, 0, 0 );
"=> regex_matches: string: %s\n", str );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );
rc, !rc ? "matches" : "no matches" );
return( !rc );
}

35
contrib/slapd-modules/addpartial/addpartial-overlay.c
View file

@ -51,7 +51,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
toAdd = op->oq_add.rs_e;
Debug(LDAP_DEBUG_TRACE, "%s: toAdd->e_nname.bv_val: %s\n",
addpartial.on_bi.bi_type, toAdd->e_nname.bv_val,0);
addpartial.on_bi.bi_type, toAdd->e_nname.bv_val );
/* if the user doesn't have access, fall through to the normal ADD */
if(!access_allowed(op, toAdd, slap_schema.si_ad_entry,
@ -66,13 +66,12 @@ static int addpartial_add( Operation *op, SlapReply *rs)
{
Debug(LDAP_DEBUG_TRACE,
"%s: no entry found, falling through to normal add\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
return SLAP_CB_CONTINUE;
}
else
{
Debug(LDAP_DEBUG_TRACE, "%s: found the dn\n", addpartial.on_bi.bi_type,
0,0);
Debug(LDAP_DEBUG_TRACE, "%s: found the dn\n", addpartial.on_bi.bi_type );
if(found)
{
@ -84,7 +83,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
Modifications *mod = NULL;
Debug(LDAP_DEBUG_TRACE, "%s: have an entry!\n",
addpartial.on_bi.bi_type,0,0);
addpartial.on_bi.bi_type );
/* determine if the changes are in the found entry */
for(attr = toAdd->e_attrs; attr; attr = attr->a_next)
@ -96,7 +95,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
{
Debug(LDAP_DEBUG_TRACE, "%s: Attribute %s not found!\n",
addpartial.on_bi.bi_type,
attr->a_desc->ad_cname.bv_val,0);
attr->a_desc->ad_cname.bv_val );
mod = (Modifications *) ch_malloc(sizeof(
Modifications));
mod->sml_flags = 0;
@ -119,7 +118,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
int acount , bcount;
Debug(LDAP_DEBUG_TRACE, "%s: Attribute %s found\n",
addpartial.on_bi.bi_type,
attr->a_desc->ad_cname.bv_val,0);
attr->a_desc->ad_cname.bv_val );
for(bv = attr->a_vals, acount = 0; bv->bv_val != NULL;
bv++, acount++)
@ -135,7 +134,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
{
Debug(LDAP_DEBUG_TRACE, "%s: acount != bcount, %s\n",
addpartial.on_bi.bi_type,
"replace all",0);
"replace all" );
mod = (Modifications *) ch_malloc(sizeof(
Modifications));
mod->sml_flags = 0;
@ -172,7 +171,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
Debug(LDAP_DEBUG_TRACE,
"%s: \tvalue DNE, r: %d \n",
addpartial.on_bi.bi_type,
r,0);
r );
ret = strcmp(bv->bv_val, v->bv_val);
if(ret == 0)
break;
@ -221,7 +220,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
Debug(LDAP_DEBUG_TRACE,
"%s: Attribute %s not found in new entry!!!\n",
addpartial.on_bi.bi_type,
attr->a_desc->ad_cname.bv_val, 0);
attr->a_desc->ad_cname.bv_val );
mod = (Modifications *) ch_malloc(sizeof(
Modifications));
mod->sml_flags = 0;
@ -240,7 +239,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
Debug(LDAP_DEBUG_TRACE,
"%s: Attribute %s found in new entry\n",
addpartial.on_bi.bi_type,
at->a_desc->ad_cname.bv_val, 0);
at->a_desc->ad_cname.bv_val );
}
}
@ -255,7 +254,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
NULL, NULL };
Debug(LDAP_DEBUG_TRACE, "%s: mods to do...\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
nop.o_tag = LDAP_REQ_MODIFY;
nop.orm_modlist = mods;
@ -270,7 +269,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
}
Debug(LDAP_DEBUG_TRACE, "%s: number of mods: %d\n",
addpartial.on_bi.bi_type, modcount, 0);
addpartial.on_bi.bi_type, modcount );
if(nop.o_bd->be_modify)
{
@ -282,12 +281,12 @@ static int addpartial_add( Operation *op, SlapReply *rs)
{
Debug(LDAP_DEBUG_TRACE,
"%s: modify successful\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
}
else
{
Debug(LDAP_DEBUG_TRACE, "%s: modify unsuccessful: %d\n",
addpartial.on_bi.bi_type, rc, 0);
addpartial.on_bi.bi_type, rc );
rs->sr_err = rc;
if(nullcb.sc_private)
{
@ -296,7 +295,7 @@ static int addpartial_add( Operation *op, SlapReply *rs)
}
Debug(LDAP_DEBUG_TRACE, "%s: freeing mods...\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
for(toDel = mods; toDel; toDel = mods)
{
@ -307,13 +306,13 @@ static int addpartial_add( Operation *op, SlapReply *rs)
else
{
Debug(LDAP_DEBUG_TRACE, "%s: no mods to process\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
}
}
else
{
Debug(LDAP_DEBUG_TRACE, "%s: no entry!\n",
addpartial.on_bi.bi_type, 0, 0);
addpartial.on_bi.bi_type );
}
op->o_callback = NULL;

4
contrib/slapd-modules/allowed/allowed.c
View file

@ -462,7 +462,7 @@ register_at( char *def, AttributeDescription **rad, int dupok )
}
if ( code ) {
Debug( LDAP_DEBUG_ANY, "register_at: AttributeType \"%s\": %s\n",
def, err, 0 );
def, err );
}
if ( rad ) *rad = ad;
return code;
@ -488,7 +488,7 @@ aa_initialize( void )
code = register_at( aa_attrs[i].at, aa_attrs[i].ad, 0 );
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"aa_initialize: register_at failed\n", 0, 0, 0 );
"aa_initialize: register_at failed\n" );
return -1;
}
}

4
contrib/slapd-modules/authzid/authzid.c
View file

@ -331,7 +331,7 @@ authzid_db_init( BackendDB *be, ConfigReply *cr )
if ( cr ) {
snprintf( cr->msg, sizeof(cr->msg),
"slapo-authzid must be global" );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg, 0, 0 );
Debug( LDAP_DEBUG_ANY, "%s\n", cr->msg );
}
return 1;
}
@ -344,7 +344,7 @@ authzid_db_init( BackendDB *be, ConfigReply *cr )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"authzid_initialize: Failed to register control '%s' (%d)\n",
LDAP_CONTROL_AUTHZID_REQUEST, rc, 0 );
LDAP_CONTROL_AUTHZID_REQUEST, rc );
return rc;
}

108
contrib/slapd-modules/autogroup/autogroup.c
View file

@ -119,7 +119,7 @@ autogroup_add_member_to_group( Operation *op, BerValue *dn, BerValue *ndn, autog
assert( dn != NULL );
assert( ndn != NULL );
Debug(LDAP_DEBUG_TRACE, "==> autogroup_add_member_to_group adding <%s> to <%s>\n",
dn->bv_val, age->age_dn.bv_val, 0);
dn->bv_val, age->age_dn.bv_val );
vals = (BerValue *)ch_calloc( 2, sizeof( BerValue ) );
nvals = (BerValue *)ch_calloc( 2, sizeof( BerValue ) );
@ -182,7 +182,7 @@ autogroup_add_member_values_to_group( Operation *op, struct berval *dn, autogrou
OpExtra oex;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_add_member_values_to_group adding <%s> to <%s>\n",
dn->bv_val, age->age_dn.bv_val, 0);
dn->bv_val, age->age_dn.bv_val );
modlist.sml_op = LDAP_MOD_ADD;
modlist.sml_desc = age->age_def->agd_member_ad;
@ -238,14 +238,14 @@ autogroup_delete_member_from_group( Operation *op, BerValue *dn, BerValue *ndn,
if ( dn == NULL || ndn == NULL ) {
Debug(LDAP_DEBUG_TRACE, "==> autogroup_delete_member_from_group removing all members from <%s>\n",
age->age_dn.bv_val, 0 ,0);
age->age_dn.bv_val );
modlist->sml_values = NULL;
modlist->sml_nvalues = NULL;
modlist->sml_numvals = 0;
} else {
Debug(LDAP_DEBUG_TRACE, "==> autogroup_delete_member_from_group removing <%s> from <%s>\n",
dn->bv_val, age->age_dn.bv_val, 0);
dn->bv_val, age->age_dn.bv_val );
vals = (BerValue *)ch_calloc( 2, sizeof( BerValue ) );
nvals = (BerValue *)ch_calloc( 2, sizeof( BerValue ) );
@ -311,7 +311,7 @@ autogroup_delete_member_values_from_group( Operation *op, struct berval *dn, aut
OpExtra oex;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_delete_member_values_from_group removing <%s> from <%s>\n",
dn->bv_val, age->age_dn.bv_val, 0);
dn->bv_val, age->age_dn.bv_val );
modlist.sml_op = LDAP_MOD_DELETE;
modlist.sml_desc = age->age_def->agd_member_ad;
@ -372,7 +372,7 @@ autogroup_member_search_cb( Operation *op, SlapReply *rs )
int numvals;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_member_search_cb <%s>\n",
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN", 0, 0);
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN" );
if ( agf->agf_anlist ) {
Attribute *attr = attrs_find( rs->sr_entry->e_attrs, agf->agf_anlist[0].an_desc );
@ -428,7 +428,7 @@ autogroup_member_search_modify_cb( Operation *op, SlapReply *rs )
int numvals;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_member_search_modify_cb <%s>\n",
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN", 0, 0);
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN" );
if ( agf->agf_anlist ) {
Attribute *attr = attrs_find( rs->sr_entry->e_attrs, agf->agf_anlist[0].an_desc );
@ -500,7 +500,7 @@ autogroup_add_members_from_filter( Operation *op, Entry *e, autogroup_entry_t *a
OpExtra oex;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_add_members_from_filter <%s>\n",
age->age_dn.bv_val, 0, 0);
age->age_dn.bv_val );
o.ors_attrsonly = 0;
o.o_tag = LDAP_REQ_SEARCH;
@ -603,7 +603,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
if ( e == NULL ) {
if ( overlay_entry_get_ov( op, ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot get entry for <%s>\n", ndn->bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot get entry for <%s>\n", ndn->bv_val );
return 1;
}
@ -611,13 +611,13 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
}
Debug(LDAP_DEBUG_TRACE, "==> autogroup_add_group <%s>\n",
e->e_name.bv_val, 0, 0);
e->e_name.bv_val );
if ( agi->agi_entry != NULL ) {
for ( ; *agep ; agep = &(*agep)->age_next ) {
dnMatch( &match, 0, NULL, NULL, &e->e_nname, &(*agep)->age_ndn );
if ( match == 0 ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: group already exists: <%s>\n", e->e_name.bv_val,0,0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: group already exists: <%s>\n", e->e_name.bv_val );
return 1;
}
/* goto last */;
@ -643,14 +643,14 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
}
if( a == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: group has no memberURL\n", 0,0,0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: group has no memberURL\n" );
} else {
for ( bv = a->a_nvals; !BER_BVISNULL( bv ); bv++ ) {
agf = (autogroup_filter_t*)ch_calloc( 1, sizeof( autogroup_filter_t ) );
if ( ldap_url_parse( bv->bv_val, &lud ) != LDAP_URL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot parse url <%s>\n", bv->bv_val,0,0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot parse url <%s>\n", bv->bv_val );
/* FIXME: error? */
ch_free( agf );
continue;
@ -666,7 +666,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
rc = dnPrettyNormal( NULL, &dn, &agf->agf_dn, &agf->agf_ndn, NULL );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot normalize DN <%s>\n", dn.bv_val,0,0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: cannot normalize DN <%s>\n", dn.bv_val );
/* FIXME: error? */
goto cleanup;
}
@ -675,7 +675,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
ber_str2bv( lud->lud_filter, 0, 1, &agf->agf_filterstr);
agf->agf_filter = str2filter( lud->lud_filter );
} else {
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: URL filter is missing <%s>\n", bv->bv_val,0,0);
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: URL filter is missing <%s>\n", bv->bv_val );
/* FIXME: error? */
goto cleanup;
}
@ -689,7 +689,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
if ( i > 1 ) {
Debug( LDAP_DEBUG_ANY, "autogroup_add_group: too many attributes specified in url <%s>\n",
bv->bv_val, 0, 0);
bv->bv_val );
/* FIXME: error? */
filter_free( agf->agf_filter );
ch_free( agf->agf_filterstr.bv_val );
@ -704,7 +704,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
if ( agf->agf_anlist == NULL ) {
Debug( LDAP_DEBUG_ANY, "autogroup_add_group: unable to find AttributeDescription \"%s\".\n",
lud->lud_attrs[0], 0, 0 );
lud->lud_attrs[0] );
/* FIXME: error? */
filter_free( agf->agf_filter );
ch_free( agf->agf_filterstr.bv_val );
@ -733,7 +733,7 @@ autogroup_add_group( Operation *op, autogroup_info_t *agi, autogroup_def_t *agd,
}
Debug( LDAP_DEBUG_TRACE, "autogroup_add_group: added memberURL DN <%s> with filter <%s>\n",
agf->agf_ndn.bv_val, agf->agf_filterstr.bv_val, 0);
agf->agf_ndn.bv_val, agf->agf_filterstr.bv_val );
ldap_free_urldesc( lud );
@ -768,7 +768,7 @@ autogroup_group_add_cb( Operation *op, SlapReply *rs )
autogroup_sc_t *ags = (autogroup_sc_t *)op->o_callback->sc_private;
Debug(LDAP_DEBUG_TRACE, "==> autogroup_group_add_cb <%s>\n",
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN", 0, 0);
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "UNKNOWN_DN" );
autogroup_add_group( op, ags->ags_info, ags->ags_def, rs->sr_entry, NULL, 0, 0);
}
@ -861,7 +861,7 @@ autogroup_add_entry( Operation *op, SlapReply *rs)
ag_addinfo *aa = NULL;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_add_entry <%s>\n",
op->ora_e->e_name.bv_val, 0, 0);
op->ora_e->e_name.bv_val );
sc = op->o_tmpcalloc( sizeof(slap_callback) + sizeof(ag_addinfo), 1, op->o_tmpmemctx );
sc->sc_private = (sc+1);
@ -910,7 +910,7 @@ autogroup_delete_group( autogroup_info_t *agi, autogroup_entry_t *e )
int rc = 1;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_delete_group <%s>\n",
age->age_dn.bv_val, 0, 0);
age->age_dn.bv_val );
for ( age_next = age ; age_next ; age_prev = age, age = age_next ) {
age_next = age->age_next;
@ -949,7 +949,7 @@ autogroup_delete_group( autogroup_info_t *agi, autogroup_entry_t *e )
}
}
Debug( LDAP_DEBUG_TRACE, "autogroup_delete_group: group <%s> not found, should not happen\n", age->age_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_delete_group: group <%s> not found, should not happen\n", age->age_dn.bv_val );
return rc;
@ -972,13 +972,13 @@ autogroup_delete_entry( Operation *op, SlapReply *rs)
return SLAP_CB_CONTINUE;
}
Debug( LDAP_DEBUG_TRACE, "==> autogroup_delete_entry <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_delete_entry <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_lock( &agi->agi_mutex );
if ( overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_delete_entry: cannot get entry for <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_delete_entry: cannot get entry for <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1097,7 +1097,7 @@ autogroup_response( Operation *op, SlapReply *rs )
} else if ( op->o_tag == LDAP_REQ_MODRDN ) {
if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS && !oex ) {
Debug( LDAP_DEBUG_TRACE, "==> autogroup_response MODRDN from <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_response MODRDN from <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_lock( &agi->agi_mutex );
@ -1115,13 +1115,13 @@ autogroup_response( Operation *op, SlapReply *rs )
}
build_new_dn( &new_ndn, &pdn, &op->orr_nnewrdn, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN to <%s>\n", new_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN to <%s>\n", new_dn.bv_val );
dnMatch( &dn_equal, 0, NULL, NULL, &op->o_req_ndn, &new_ndn );
if ( overlay_entry_get_ov( op, &new_ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN cannot get entry for <%s>\n", new_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN cannot get entry for <%s>\n", new_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1130,7 +1130,7 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( a == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN entry <%s> has no objectClass\n", new_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN entry <%s> has no objectClass\n", new_dn.bv_val );
overlay_entry_release_ov( op, e, 0, on );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
@ -1151,7 +1151,7 @@ autogroup_response( Operation *op, SlapReply *rs )
dnMatch( &match, 0, NULL, NULL, &age->age_ndn, &op->o_req_ndn );
if ( match == 0 ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN updating group's DN to <%s>\n", new_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN updating group's DN to <%s>\n", new_dn.bv_val );
ber_dupbv( &age->age_dn, &new_dn );
ber_dupbv( &age->age_ndn, &new_ndn );
@ -1201,7 +1201,7 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( overlay_entry_get_ov( op, &age->age_ndn, NULL, NULL, 0, &group, on ) !=
LDAP_SUCCESS || group == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN cannot get group entry <%s>\n", age->age_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODRDN cannot get group entry <%s>\n", age->age_dn.bv_val );
op->o_tmpfree( new_dn.bv_val, op->o_tmpmemctx );
op->o_tmpfree( new_ndn.bv_val, op->o_tmpmemctx );
@ -1310,13 +1310,13 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( rs->sr_type == REP_RESULT && rs->sr_err == LDAP_SUCCESS && !oex ) {
Entry etmp;
struct berval odn, ondn;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_response MODIFY <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_response MODIFY <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_lock( &agi->agi_mutex );
if ( overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY cannot get entry for <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY cannot get entry for <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1325,7 +1325,7 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( a == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY entry <%s> has no objectClass\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY entry <%s> has no objectClass\n", op->o_req_dn.bv_val );
overlay_entry_release_ov( op, e, 0, on );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
@ -1356,7 +1356,7 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( m->sml_desc == age->age_def->agd_member_url_ad ) {
autogroup_def_t *group_agd = age->age_def;
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY changing memberURL for group <%s>\n",
op->o_req_dn.bv_val, 0, 0);
op->o_req_dn.bv_val );
overlay_entry_release_ov( op, e, 0, on );
@ -1418,7 +1418,7 @@ autogroup_response( Operation *op, SlapReply *rs )
if ( overlay_entry_get_ov( op, &age->age_ndn, NULL, NULL, 0, &group, on ) !=
LDAP_SUCCESS || group == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_response MODIFY cannot get entry for <%s>\n",
age->age_dn.bv_val, 0, 0);
age->age_dn.bv_val );
attrs_free( attrs );
ldap_pvt_thread_mutex_unlock( &age->age_mutex );
@ -1528,12 +1528,12 @@ autogroup_modify_entry( Operation *op, SlapReply *rs)
return SLAP_CB_CONTINUE;
}
Debug( LDAP_DEBUG_TRACE, "==> autogroup_modify_entry <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_modify_entry <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_lock( &agi->agi_mutex );
if ( overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry cannot get entry for <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry cannot get entry for <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1572,7 +1572,7 @@ autogroup_modify_entry( Operation *op, SlapReply *rs)
a = attrs_find( e->e_attrs, slap_schema.si_ad_objectClass );
if ( a == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry entry <%s> has no objectClass\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry entry <%s> has no objectClass\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1599,7 +1599,7 @@ autogroup_modify_entry( Operation *op, SlapReply *rs)
if ( m->sml_desc == age->age_def->agd_member_ad ) {
overlay_entry_release_ov( op, e, 0, on );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry attempted to modify group's <%s> member attribute\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_modify_entry attempted to modify group's <%s> member attribute\n", op->o_req_dn.bv_val );
send_ldap_error(op, rs, LDAP_CONSTRAINT_VIOLATION, "attempt to modify dynamic group member attribute");
return LDAP_CONSTRAINT_VIOLATION;
}
@ -1636,12 +1636,12 @@ autogroup_modrdn_entry( Operation *op, SlapReply *rs)
return SLAP_CB_CONTINUE;
}
Debug( LDAP_DEBUG_TRACE, "==> autogroup_modrdn_entry <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_modrdn_entry <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_lock( &agi->agi_mutex );
if ( overlay_entry_get_ov( op, &op->o_req_ndn, NULL, NULL, 0, &e, on ) !=
LDAP_SUCCESS || e == NULL ) {
Debug( LDAP_DEBUG_TRACE, "autogroup_modrdn_entry cannot get entry for <%s>\n", op->o_req_dn.bv_val, 0, 0);
Debug( LDAP_DEBUG_TRACE, "autogroup_modrdn_entry cannot get entry for <%s>\n", op->o_req_dn.bv_val );
ldap_pvt_thread_mutex_unlock( &agi->agi_mutex );
return SLAP_CB_CONTINUE;
}
@ -1682,7 +1682,7 @@ autogroup_build_def_filter( autogroup_def_t *agd, Operation *op )
{
char *ptr;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_build_def_filter\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_build_def_filter\n" );
op->ors_filterstr.bv_len = STRLENOF( "(=)" )
+ slap_schema.si_ad_objectClass->ad_cname.bv_len
@ -1756,7 +1756,7 @@ ag_cfgen( ConfigArgs *c )
int rc = 0, i;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_cfgen\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_cfgen\n" );
if( agi == NULL ) {
agi = (autogroup_info_t*)ch_calloc( 1, sizeof(autogroup_info_t) );
@ -1917,7 +1917,7 @@ ag_cfgen( ConfigArgs *c )
"unable to find ObjectClass \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -1929,7 +1929,7 @@ ag_cfgen( ConfigArgs *c )
"unable to find AttributeDescription \"%s\"",
c->argv[ 2 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -1940,7 +1940,7 @@ ag_cfgen( ConfigArgs *c )
"must be of a subtype \"labeledURI\"",
c->argv[ 2 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -1951,7 +1951,7 @@ ag_cfgen( ConfigArgs *c )
"unable to find AttributeDescription \"%s\"",
c->argv[ 3 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -1965,7 +1965,7 @@ ag_cfgen( ConfigArgs *c )
"URL attributeDescription \"%s\" already mapped",
member_ad->ad_cname.bv_val );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
/* return 1; //warning*/
}
}
@ -1982,7 +1982,7 @@ ag_cfgen( ConfigArgs *c )
"invalid index {%d}",
c->valx );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -2016,7 +2016,7 @@ ag_cfgen( ConfigArgs *c )
"unable to find AttributeDescription \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -2028,7 +2028,7 @@ ag_cfgen( ConfigArgs *c )
"have DN (%s) or nameUID (%s) syntax",
c->argv[ 1 ], SLAPD_DN_SYNTAX, SLAPD_NAMEUID_SYNTAX );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -2066,7 +2066,7 @@ autogroup_db_open(
Connection conn = { 0 };
OperationBuffer opbuf;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_open\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_open\n" );
if ( agi == NULL || !( slapMode & SLAP_SERVER_MODE )) {
return 0;
@ -2138,7 +2138,7 @@ autogroup_db_close(
{
slap_overinst *on = (slap_overinst *) be->bd_info;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_close\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_close\n" );
if ( on->on_bi.bi_private ) {
autogroup_info_t *agi = on->on_bi.bi_private;
@ -2180,7 +2180,7 @@ autogroup_db_destroy(
{
slap_overinst *on = (slap_overinst *) be->bd_info;
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_destroy\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "==> autogroup_db_destroy\n" );
if ( on->on_bi.bi_private ) {
autogroup_info_t *agi = on->on_bi.bi_private;

9
contrib/slapd-modules/cloak/cloak.c
View file

@ -129,7 +129,7 @@ cloak_cfgen( ConfigArgs *c )
"unable to find ObjectClass \"%s\"",
c->argv[ 2 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
}
@ -140,7 +140,7 @@ cloak_cfgen( ConfigArgs *c )
"unable to find AttributeDescription \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
@ -153,7 +153,7 @@ cloak_cfgen( ConfigArgs *c )
"invalid index {%d}\n",
c->valx );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
return 1;
}
ci_next = *cip;
@ -235,8 +235,7 @@ cloak_search_response_cb( Operation *op, SlapReply *rs )
continue;
Debug( LDAP_DEBUG_TRACE, "cloak_search_response_cb: cloak %s\n",
a->a_desc->ad_cname.bv_val,
0, 0 );
a->a_desc->ad_cname.bv_val );
if ( pa != NULL )
pa->a_next = a->a_next;

2
contrib/slapd-modules/denyop/denyop.c
View file

@ -141,7 +141,7 @@ denyop_config(
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"operation list missing in "
"\"denyop <op-list>\" line.\n",
fname, lineno, 0 );
fname, lineno );
return( 1 );
}

2
contrib/slapd-modules/dupent/dupent.c
View file

@ -535,7 +535,7 @@ dupent_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"dupent_initialize: Failed to register control (%d)\n",
rc, 0, 0 );
rc );
return -1;
}

32
contrib/slapd-modules/kinit/kinit.c
View file

@ -43,7 +43,7 @@ static void
log_krb5_errmsg( krb5_context ctx, const char* func, krb5_error_code rc )
{
const char* errmsg = krb5_get_error_message(ctx, rc);
Log2(LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "slapd-kinit: %s: %s\n", func, errmsg);
Log(LDAP_DEBUG_ANY, LDAP_LEVEL_ERR, "slapd-kinit: %s: %s\n", func, errmsg );
krb5_free_error_message(ctx, errmsg);
return;
}
@ -65,7 +65,7 @@ kinit_check_tgt(kinit_data *kid, int *remaining)
return 2;
} else {
if (!krb5_principal_compare(kid->ctx, kid->princ, princ)) {
Log0(LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log(LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"Principal in ccache does not match requested principal\n");
krb5_free_principal(kid->ctx, princ);
return 2;
@ -93,10 +93,10 @@ kinit_check_tgt(kinit_data *kid, int *remaining)
*remaining = (time_t)creds.times.endtime-now;
if ( *remaining <= 0) {
Log1(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: TGT (%s) expired\n", name);
} else {
Log4(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: TGT (%s) expires in %dh:%02dm:%02ds\n",
name, *remaining/3600, (*remaining%3600)/60, *remaining%60);
}
@ -105,12 +105,12 @@ kinit_check_tgt(kinit_data *kid, int *remaining)
if (*remaining <= 30) {
if (creds.times.renew_till-60 > now) {
int renewal=creds.times.renew_till-now;
Log3(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: Time remaining for renewal: %dh:%02dm:%02ds\n",
renewal/3600, (renewal%3600)/60, renewal%60);
ret = 1;
} else {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: Only short time left for renewal. "
"Trying to re-init.\n");
ret = 2;
@ -137,7 +137,7 @@ kinit_qtask( void *ctx, void *arg )
krb5_error_code rc;
krb5_creds creds;
int nextcheck, remaining, renew=0;
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "kinit_qtask: running TGT check\n");
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "kinit_qtask: running TGT check\n" );
memset(&creds, 0, sizeof(creds));
@ -145,16 +145,16 @@ kinit_qtask( void *ctx, void *arg )
if (renew > 0) {
if (renew==1) {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: Trying to renew TGT: ");
rc = krb5_get_renewed_creds(kid->ctx, &creds, kid->princ, kid->ccache, NULL);
if (rc!=0) {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Failed\n");
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Failed\n" );
log_krb5_errmsg( kid->ctx,
"kinit_qtask, Renewal failed: krb5_get_renewed_creds", rc );
renew++;
} else {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Success\n");
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Success\n" );
krb5_cc_initialize(kid->ctx, kid->ccache, creds.client);
krb5_cc_store_cred(kid->ctx, kid->ccache, &creds);
krb5_free_cred_contents(kid->ctx, &creds);
@ -162,15 +162,15 @@ kinit_qtask( void *ctx, void *arg )
}
}
if (renew > 1) {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: Trying to get new TGT: ");
rc = krb5_get_init_creds_keytab( kid->ctx, &creds, kid->princ,
kid->keytab, 0, NULL, kid->opts);
if (rc) {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Failed\n");
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Failed\n" );
log_krb5_errmsg(kid->ctx, "krb5_get_init_creds_keytab", rc);
} else {
Log0(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Success\n");
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Success\n" );
renew=kinit_check_tgt(kid, &remaining);
}
krb5_free_cred_contents(kid->ctx, &creds);
@ -186,7 +186,7 @@ kinit_qtask( void *ctx, void *arg )
if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
}
Log3(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG,
"kinit_qtask: Next TGT check in %dh:%02dm:%02ds\n",
nextcheck/3600, (nextcheck%3600)/60, nextcheck%60);
rtask->interval.tv_sec = nextcheck;
@ -199,7 +199,7 @@ kinit_qtask( void *ctx, void *arg )
int
kinit_initialize(void)
{
Log0( LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "kinit_initialize\n" );
Log( LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "kinit_initialize\n" );
krb5_error_code rc;
struct re_s *task = NULL;
@ -214,7 +214,7 @@ kinit_initialize(void)
int len=STRLENOF("ldap/")+global_host_bv.bv_len+1;
principal=ch_calloc(len, 1);
snprintf(principal, len, "ldap/%s", global_host_bv.bv_val);
Log1(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Principal <%s>\n", principal);
Log(LDAP_DEBUG_TRACE, LDAP_LEVEL_DEBUG, "Principal <%s>\n", principal );
}
rc = krb5_parse_name(kid->ctx, principal, &kid->princ);

2
contrib/slapd-modules/lastbind/lastbind.c
View file

@ -290,7 +290,7 @@ int lastbind_initialize()
code = register_at( lastBind_OpSchema[i].def, lastBind_OpSchema[i].ad, 0 );
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"lastbind_initialize: register_at failed\n", 0, 0, 0 );
"lastbind_initialize: register_at failed\n" );
return code;
}
}

4
contrib/slapd-modules/lastmod/lastmod.c
View file

@ -755,7 +755,7 @@ lastmod_db_init( BackendDB *be, ConfigReply *cr )
code = register_at( mat[i].schema, ad, 0 );
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"lastmod_init: register_at failed\n", 0, 0, 0 );
"lastmod_init: register_at failed\n" );
return -1;
}
(*ad)->ad_type->sat_flags |= mat[i].flags;
@ -769,7 +769,7 @@ lastmod_db_init( BackendDB *be, ConfigReply *cr )
code = register_oc( moc[i].schema, Oc, 0 );
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"lastmod_init: register_oc failed\n", 0, 0, 0 );
"lastmod_init: register_oc failed\n" );
return -1;
}
(*Oc)->soc_flags |= moc[i].flags;

4
contrib/slapd-modules/noopsrch/noopsrch.c
View file

@ -90,7 +90,7 @@ noopsrch_response( Operation *op, SlapReply *rs )
if ( rs->sr_type == REP_SEARCH ) {
nc->nc_nentries++;
#ifdef NOOPSRCH_DEBUG
Debug( LDAP_DEBUG_TRACE, "noopsrch_response(REP_SEARCH): nentries=%d\n", nc->nc_nentries, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "noopsrch_response(REP_SEARCH): nentries=%d\n", nc->nc_nentries );
#endif
return 0;
@ -203,7 +203,7 @@ noopsrch_db_init( BackendDB *be, ConfigReply *cr)
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"noopsrch_initialize: Failed to register control '%s' (%d)\n",
LDAP_CONTROL_X_NOOPSRCH, rc, 0 );
LDAP_CONTROL_X_NOOPSRCH, rc );
return rc;
}
}

2
contrib/slapd-modules/nops/nops.c
View file

@ -131,7 +131,7 @@ nops_modify( Operation *op, SlapReply *rs )
/* This is a nop, remove it */
Debug(LDAP_DEBUG_TRACE, "removing nop on %s",
a->a_desc->ad_cname.bv_val, 0, 0 );
a->a_desc->ad_cname.bv_val );
nops_rm_mod(&op->orm_modlist, mc);
}

2
contrib/slapd-modules/nssov/alias.c
View file

@ -61,7 +61,7 @@ static int write_alias(nssov_alias_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"alias entry %s does not contain %s value\n",
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0 );
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;

4
contrib/slapd-modules/nssov/ether.c
View file

@ -77,7 +77,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0 );
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -95,7 +95,7 @@ static int write_ether(nssov_ether_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"ether entry %s does not contain %s value\n",
entry->e_name.bv_val,cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val,0 );
entry->e_name.bv_val,cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
ethers = a->a_vals;

6
contrib/slapd-modules/nssov/group.c
View file

@ -152,7 +152,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[CN_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[CN_KEY].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -170,7 +170,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"group entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[GID_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[GID_KEY].an_desc->ad_cname.bv_val );
return 0;
}
gids = a->a_vals;
@ -232,7 +232,7 @@ static int write_group(nssov_group_cbp *cbp,Entry *entry)
if (!isvalidgroupname(&names[i]))
{
Debug(LDAP_DEBUG_ANY,"nssov: group entry %s contains invalid group name: \"%s\"\n",
entry->e_name.bv_val,names[i].bv_val,0);
entry->e_name.bv_val,names[i].bv_val );
}
else
{

4
contrib/slapd-modules/nssov/host.c
View file

@ -62,7 +62,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -85,7 +85,7 @@ static int write_host(nssov_host_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"host entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
addrs = a->a_vals;

10
contrib/slapd-modules/nssov/netgroup.c
View file

@ -93,7 +93,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
/* we should have a bracket now */
if (triple[i]!='(')
{
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): entry does not begin with '(' (entry skipped)\n",0,0,0);
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): entry does not begin with '(' (entry skipped)\n" );
return 0;
}
i++;
@ -103,7 +103,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
/* nothing else to do */ ;
if (triple[i]!=',')
{
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n",0,0,0);
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n" );
return 0;
}
hoste=i;
@ -114,7 +114,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
/* nothing else to do */ ;
if (triple[i]!=',')
{
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n",0,0,0);
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ',' (entry skipped)\n" );
return 0;
}
usere=i;
@ -125,7 +125,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
/* nothing else to do */ ;
if (triple[i]!=')')
{
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ')' (entry skipped)\n",0,0,0);
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): missing ')' (entry skipped)\n" );
return 0;
}
domaine=i;
@ -136,7 +136,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple)
/* if anything is left in the string we have a problem */
if (triple[i]!='\0')
{
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): string contains trailing data (entry skipped)\n",0,0,0);
Debug(LDAP_DEBUG_ANY,"write_netgroup_triple(): string contains trailing data (entry skipped)\n" );
return 0;
}
/* write strings */

4
contrib/slapd-modules/nssov/network.c
View file

@ -62,7 +62,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value\n",
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val,cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -85,7 +85,7 @@ static int write_network(nssov_network_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"network entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
addrs = a->a_vals;

70
contrib/slapd-modules/nssov/nssov.c
View file

@ -158,7 +158,7 @@ int write_address(TFILE *fp,struct berval *addr)
/* failure, log but write simple invalid address
(otherwise the address list is messed up) */
/* TODO: have error message in correct format */
Debug(LDAP_DEBUG_ANY,"nssov: unparseable address: %s\n",addr->bv_val,0,0);
Debug(LDAP_DEBUG_ANY,"nssov: unparseable address: %s\n",addr->bv_val );
/* write an illegal address type */
WRITE_INT32(fp,-1);
/* write an empty address */
@ -176,14 +176,14 @@ int read_address(TFILE *fp,char *addr,int *addrlen,int *af)
READ_INT32(fp,*af);
if ((*af!=AF_INET)&&(*af!=AF_INET6))
{
Debug(LDAP_DEBUG_ANY,"nssov: incorrect address family specified: %d\n",*af,0,0);
Debug(LDAP_DEBUG_ANY,"nssov: incorrect address family specified: %d\n",*af );
return -1;
}
/* read address length */
READ_INT32(fp,len);
if ((len>*addrlen)||(len<=0))
{
Debug(LDAP_DEBUG_ANY,"nssov: address length incorrect: %d\n",len,0,0);
Debug(LDAP_DEBUG_ANY,"nssov: address length incorrect: %d\n",len );
return -1;
}
*addrlen=len;
@ -243,7 +243,7 @@ static int read_header(TFILE *fp,int32_t *action)
READ_INT32(fp,tmpint32);
if (tmpint32 != (int32_t)NSLCD_VERSION)
{
Debug( LDAP_DEBUG_TRACE,"nssov: wrong nslcd version id (%d)\n",(int)tmpint32,0,0);
Debug( LDAP_DEBUG_TRACE,"nssov: wrong nslcd version id (%d)\n",(int)tmpint32 );
return -1;
}
/* read the request type */
@ -258,7 +258,7 @@ int nssov_config(nssov_info *ni,TFILE *fp,Operation *op)
READ_INT32(fp,opt);
Debug(LDAP_DEBUG_TRACE, "nssov_config (%d)\n",opt,0,0);
Debug(LDAP_DEBUG_TRACE, "nssov_config (%d)\n",opt );
WRITE_INT32(fp,NSLCD_VERSION);
WRITE_INT32(fp,NSLCD_ACTION_CONFIG_GET);
@ -271,7 +271,7 @@ int nssov_config(nssov_info *ni,TFILE *fp,Operation *op)
if (!BER_BVISEMPTY(&ni->ni_pam_password_prohibit_message)) {
Debug(LDAP_DEBUG_TRACE,"nssov_config(): %s (%s)\n",
"password_prohibit_message",
ni->ni_pam_password_prohibit_message.bv_val,0);
ni->ni_pam_password_prohibit_message.bv_val );
WRITE_STRING(fp,ni->ni_pam_password_prohibit_message.bv_val);
}
default:
@ -299,10 +299,10 @@ static void handleconnection(nssov_info *ni,int sock,Operation *op)
/* log connection */
if (LUTIL_GETPEEREID(sock,&uid,&gid,&peerbv))
Debug( LDAP_DEBUG_TRACE,"nssov: connection from unknown client: %s\n",strerror(errno),0,0);
Debug( LDAP_DEBUG_TRACE,"nssov: connection from unknown client: %s\n",strerror(errno) );
else
Debug( LDAP_DEBUG_TRACE,"nssov: connection from uid=%d gid=%d\n",
(int)uid,(int)gid,0);
(int)uid,(int)gid );
/* Should do authid mapping too */
op->o_dn.bv_len = sprintf(authid,"gidNumber=%d+uidNumber=%d,cn=peercred,cn=external,cn=auth",
@ -322,7 +322,7 @@ static void handleconnection(nssov_info *ni,int sock,Operation *op)
READBUFFER_MINSIZE,READBUFFER_MAXSIZE,
WRITEBUFFER_MINSIZE,WRITEBUFFER_MAXSIZE))==NULL)
{
Debug( LDAP_DEBUG_ANY,"nssov: cannot create stream for writing: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: cannot create stream for writing: %s",strerror(errno) );
(void)close(sock);
return;
}
@ -372,7 +372,7 @@ static void handleconnection(nssov_info *ni,int sock,Operation *op)
case NSLCD_ACTION_PAM_PWMOD: (void)pam_pwmod(ni,fp,op,uid); break;
case NSLCD_ACTION_CONFIG_GET: (void)nssov_config(ni,fp,op); break;
default:
Debug( LDAP_DEBUG_ANY,"nssov: invalid request id: %d",(int)action,0,0);
Debug( LDAP_DEBUG_ANY,"nssov: invalid request id: %d",(int)action );
break;
}
/* we're done with the request */
@ -405,25 +405,25 @@ static void *acceptconn(void *ctx, void *arg)
{
if ((errno==EINTR)||(errno==EAGAIN)||(errno==EWOULDBLOCK))
{
Debug( LDAP_DEBUG_TRACE,"nssov: accept() failed (ignored): %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_TRACE,"nssov: accept() failed (ignored): %s",strerror(errno) );
return NULL;
}
Debug( LDAP_DEBUG_ANY,"nssov: accept() failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: accept() failed: %s",strerror(errno) );
return NULL;
}
/* make sure O_NONBLOCK is not inherited */
if ((j=fcntl(csock,F_GETFL,0))<0)
{
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_GETFL) failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_GETFL) failed: %s",strerror(errno) );
if (close(csock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return NULL;
}
if (fcntl(csock,F_SETFL,j&~O_NONBLOCK)<0)
{
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_SETFL,~O_NONBLOCK) failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_SETFL,~O_NONBLOCK) failed: %s",strerror(errno) );
if (close(csock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return NULL;
}
}
@ -732,7 +732,7 @@ nss_cf_gen(ConfigArgs *c)
if (i != LDAP_SUCCESS) {
snprintf(c->cr_msg, sizeof(c->cr_msg),
"nssov: host attr unknown: %s", text);
Debug(LDAP_DEBUG_ANY,"%s\n",c->cr_msg,0,0);
Debug(LDAP_DEBUG_ANY,"%s\n",c->cr_msg );
rc = 1;
break;
}
@ -743,7 +743,7 @@ nss_cf_gen(ConfigArgs *c)
if (i != LDAP_SUCCESS) {
snprintf(c->cr_msg, sizeof(c->cr_msg),
"nssov: authorizedService attr unknown: %s", text);
Debug(LDAP_DEBUG_ANY,"%s\n",c->cr_msg,0,0);
Debug(LDAP_DEBUG_ANY,"%s\n",c->cr_msg );
rc = 1;
break;
}
@ -837,7 +837,7 @@ nssov_db_open(
if ( slap_bv2ad( &mi->mi_attrs[j].an_name,
&mi->mi_attrs[j].an_desc, &text )) {
Debug(LDAP_DEBUG_ANY,"nssov: invalid attr \"%s\": %s\n",
mi->mi_attrs[j].an_name.bv_val, text, 0 );
mi->mi_attrs[j].an_name.bv_val, text );
return -1;
}
}
@ -852,7 +852,7 @@ nssov_db_open(
i = slap_str2ad("host", &nssov_pam_host_ad, &text);
if (i != LDAP_SUCCESS) {
Debug(LDAP_DEBUG_ANY,"nssov: host attr unknown: %s\n",
text, 0, 0 );
text );
return -1;
}
}
@ -863,7 +863,7 @@ nssov_db_open(
i = slap_str2ad("authorizedService", &nssov_pam_svc_ad, &text);
if (i != LDAP_SUCCESS) {
Debug(LDAP_DEBUG_ANY,"nssov: authorizedService attr unknown: %s\n",
text, 0, 0 );
text );
return -1;
}
}
@ -871,22 +871,22 @@ nssov_db_open(
/* make sure /var/run/nslcd exists */
if (mkdir(NSLCD_PATH, (mode_t) 0555)) {
Debug(LDAP_DEBUG_TRACE,"nssov: mkdir(%s) failed (ignored): %s\n",
NSLCD_PATH,strerror(errno),0);
NSLCD_PATH,strerror(errno) );
} else {
Debug(LDAP_DEBUG_TRACE,"nssov: created %s\n",NSLCD_PATH,0,0);
Debug(LDAP_DEBUG_TRACE,"nssov: created %s\n",NSLCD_PATH );
}
/* create a socket */
if ( (sock=socket(PF_UNIX,SOCK_STREAM,0))<0 )
{
Debug(LDAP_DEBUG_ANY,"nssov: cannot create socket: %s\n",strerror(errno),0,0);
Debug(LDAP_DEBUG_ANY,"nssov: cannot create socket: %s\n",strerror(errno) );
return -1;
}
/* remove existing named socket */
if (unlink(NSLCD_SOCKET)<0)
{
Debug( LDAP_DEBUG_TRACE,"nssov: unlink() of "NSLCD_SOCKET" failed (ignored): %s\n",
strerror(errno),0,0);
strerror(errno) );
}
/* create socket address structure */
memset(&addr,0,sizeof(struct sockaddr_un));
@ -897,17 +897,17 @@ nssov_db_open(
if (bind(sock,(struct sockaddr *)&addr,sizeof(struct sockaddr_un)))
{
Debug( LDAP_DEBUG_ANY,"nssov: bind() to "NSLCD_SOCKET" failed: %s",
strerror(errno),0,0);
strerror(errno) );
if (close(sock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return -1;
}
/* close the file descriptor on exit */
if (fcntl(sock,F_SETFD,FD_CLOEXEC)<0)
{
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_SETFL,O_NONBLOCK) failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: fcntl(F_SETFL,O_NONBLOCK) failed: %s",strerror(errno) );
if (close(sock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return -1;
}
/* set permissions of socket so anybody can do requests */
@ -917,17 +917,17 @@ nssov_db_open(
http://lkml.org/lkml/2005/5/16/11 */
if (chmod(NSLCD_SOCKET,(mode_t)0666))
{
Debug( LDAP_DEBUG_ANY,"nssov: chmod(0666) failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: chmod(0666) failed: %s",strerror(errno) );
if (close(sock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return -1;
}
/* start listening for connections */
if (listen(sock,SOMAXCONN)<0)
{
Debug( LDAP_DEBUG_ANY,"nssov: listen() failed: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: listen() failed: %s",strerror(errno) );
if (close(sock))
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"nssov: problem closing socket: %s",strerror(errno) );
return -1;
}
ni->ni_socket = sock;
@ -950,14 +950,14 @@ nssov_db_close(
if (ni->ni_socket >= 0)
{
if (close(ni->ni_socket))
Debug( LDAP_DEBUG_ANY,"problem closing server socket (ignored): %s",strerror(errno),0,0);
Debug( LDAP_DEBUG_ANY,"problem closing server socket (ignored): %s",strerror(errno) );
ni->ni_socket = -1;
}
/* remove existing named socket */
if (unlink(NSLCD_SOCKET)<0)
{
Debug( LDAP_DEBUG_TRACE,"unlink() of "NSLCD_SOCKET" failed (ignored): %s",
strerror(errno),0,0);
strerror(errno) );
}
}
return 0;

48
contrib/slapd-modules/nssov/pam.c
View file

@ -117,7 +117,7 @@ static int pam_uid2dn(nssov_info *ni, Operation *op,
if (!isvalidusername(&pi->uid)) {
Debug(LDAP_DEBUG_ANY,"nssov_pam_uid2dn(%s): invalid user name\n",
pi->uid.bv_val ? pi->uid.bv_val : "NULL",0,0);
pi->uid.bv_val ? pi->uid.bv_val : "NULL" );
return NSLCD_PAM_USER_UNKNOWN;
}
@ -210,7 +210,7 @@ int pam_do_bind(nssov_info *ni,TFILE *fp,Operation *op,
}
finish:
Debug(LDAP_DEBUG_ANY,"pam_do_bind (%s): rc (%d)\n",
pi->dn.bv_val ? pi->dn.bv_val : "NULL", rc, 0);
pi->dn.bv_val ? pi->dn.bv_val : "NULL", rc );
return rc;
}
@ -247,7 +247,7 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
pi.pwd.bv_len = tmpint32;
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(%s)\n",
pi.uid.bv_val ? pi.uid.bv_val : "NULL",0,0);
pi.uid.bv_val ? pi.uid.bv_val : "NULL" );
BER_BVZERO(&pi.msg);
pi.ispwdmgr = 0;
@ -258,7 +258,7 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
!BER_BVISEMPTY(&ni->ni_pam_password_prohibit_message)) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(): %s (%s)\n",
"password_prohibit_message for passwd",
ni->ni_pam_password_prohibit_message.bv_val,0);
ni->ni_pam_password_prohibit_message.bv_val );
ber_str2bv(ni->ni_pam_password_prohibit_message.bv_val, 0, 0, &pi.msg);
pi.authz = NSLCD_PAM_PERM_DENIED;
rc = NSLCD_PAM_PERM_DENIED;
@ -270,14 +270,14 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
if (BER_BVISEMPTY(&ni->ni_pam_pwdmgr_dn)) {
/* pwdmgr dn not configured */
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(prelim check): %s\n",
"pwdmgr dn not configured", 0, 0);
"pwdmgr dn not configured" );
ber_str2bv("pwdmgr dn not configured", 0, 0, &pi.msg);
pi.authz = NSLCD_PAM_PERM_DENIED;
rc = NSLCD_PAM_PERM_DENIED;
goto finish;
} else if (calleruid != 0) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(prelim check): %s\n",
"caller is not root", 0, 0);
"caller is not root" );
ber_str2bv("only root may do that", 0, 0, &pi.msg);
pi.authz = NSLCD_PAM_PERM_DENIED;
rc = NSLCD_PAM_PERM_DENIED;
@ -291,7 +291,7 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
if (BER_BVISEMPTY(&pi.pwd)) {
if (BER_BVISEMPTY(&ni->ni_pam_pwdmgr_pwd)) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(prelim check): %s\n",
"no pwdmgr pwd", 0, 0);
"no pwdmgr pwd" );
ber_str2bv("pwdmgr pwd not configured", 0, 0, &pi.msg);
pi.authz = NSLCD_PAM_PERM_DENIED;
rc = NSLCD_PAM_PERM_DENIED;
@ -311,7 +311,7 @@ int pam_authc(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
finish:
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authc(%s): rc (%d)\n",
pi.dn.bv_val ? pi.dn.bv_val : "NULL",rc,0);
pi.dn.bv_val ? pi.dn.bv_val : "NULL",rc );
WRITE_INT32(fp,NSLCD_VERSION);
WRITE_INT32(fp,NSLCD_ACTION_PAM_AUTHC);
WRITE_INT32(fp,NSLCD_RESULT_BEGIN);
@ -374,7 +374,7 @@ int pam_authz(nssov_info *ni,TFILE *fp,Operation *op)
if (rc) goto finish;
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authz(%s)\n",
pi.dn.bv_val ? pi.dn.bv_val : "NULL",0,0);
pi.dn.bv_val ? pi.dn.bv_val : "NULL" );
/* See if they have access to the host and service */
if ((ni->ni_pam_opts & NI_PAM_HOSTSVC) && nssov_pam_svc_ad) {
@ -548,16 +548,16 @@ finish:
}
switch (rc) {
case NSLCD_PAM_SUCCESS:
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authz(): success\n", 0,0,0);
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authz(): success\n" );
break;
case NSLCD_PAM_PERM_DENIED:
Debug(LDAP_DEBUG_TRACE,"nssov_pam_authz(): %s\n",
authzmsg.bv_val ? authzmsg.bv_val : "NULL",0,0);
authzmsg.bv_val ? authzmsg.bv_val : "NULL" );
break;
default:
Debug(LDAP_DEBUG_TRACE,
"nssov_pam_authz(): permission denied, rc (%d)\n",
rc, 0, 0);
rc );
}
return 0;
}
@ -612,12 +612,12 @@ static int pam_sess(nssov_info *ni,TFILE *fp,Operation *op,int action)
if (rc) goto done;
Debug(LDAP_DEBUG_TRACE,"nssov_pam_sess_%c(%s)\n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c', pi.dn.bv_val,0);
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c', pi.dn.bv_val );
if (!ni->ni_pam_sessions) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_sess_%c(): %s\n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c',
"pam session(s) not configured, ignored",0);
"pam session(s) not configured, ignored" );
rc = -1;
goto done;
}
@ -636,7 +636,7 @@ static int pam_sess(nssov_info *ni,TFILE *fp,Operation *op,int action)
Debug(LDAP_DEBUG_TRACE,
"nssov_pam_sess_%c(): service(%s) not configured, ignored\n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c',
pi.svc.bv_val,0);
pi.svc.bv_val );
rc = -1;
goto done;
}
@ -650,7 +650,7 @@ static int pam_sess(nssov_info *ni,TFILE *fp,Operation *op,int action)
pi.ruser.bv_val, pi.rhost.bv_val);
Debug(LDAP_DEBUG_TRACE, "nssov_pam_sess_%c(): loginStatus (%s) \n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c', bv[0].bv_val,0);
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c', bv[0].bv_val );
mod.sml_numvals = 1;
mod.sml_values = bv;
@ -675,8 +675,7 @@ static int pam_sess(nssov_info *ni,TFILE *fp,Operation *op,int action)
if (op->o_bd->be_modify( op, &rs ) != LDAP_SUCCESS) {
Debug(LDAP_DEBUG_TRACE,
"nssov_pam_sess_%c(): modify op failed\n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c',
0,0);
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c' );
rc = -1;
}
@ -690,8 +689,7 @@ done:;
if (rc == 0) {
Debug(LDAP_DEBUG_TRACE,
"nssov_pam_sess_%c(): success\n",
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c',
0,0);
action==NSLCD_ACTION_PAM_SESS_O ? 'o' : 'c' );
}
WRITE_INT32(fp,NSLCD_VERSION);
WRITE_INT32(fp,action);
@ -765,7 +763,7 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
if (!BER_BVISEMPTY(&ni->ni_pam_password_prohibit_message)) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(): %s (%s)\n",
"password_prohibit_message",
ni->ni_pam_password_prohibit_message.bv_val,0);
ni->ni_pam_password_prohibit_message.bv_val );
ber_str2bv(ni->ni_pam_password_prohibit_message.bv_val, 0, 0, &pi.msg);
rc = NSLCD_PAM_PERM_DENIED;
goto done;
@ -774,14 +772,14 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
if (asroot) {
if (BER_BVISEMPTY(&ni->ni_pam_pwdmgr_dn)) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(), %s\n",
"pwdmgr not configured", 0, 0);
"pwdmgr not configured" );
ber_str2bv("pwdmgr not configured", 0, 0, &pi.msg);
rc = NSLCD_PAM_PERM_DENIED;
goto done;
}
if (calleruid != 0) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(): %s\n",
"caller is not root", 0, 0);
"caller is not root" );
ber_str2bv("only root may do that", 0, 0, &pi.msg);
rc = NSLCD_PAM_PERM_DENIED;
goto done;
@ -792,7 +790,7 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
if (!pi.ispwdmgr && BER_BVISEMPTY(&pi.pwd)) {
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(), %s\n",
"not pwdmgr and old pwd empty", 0, 0);
"not pwdmgr and old pwd empty" );
ber_str2bv("must provide old password", 0, 0, &pi.msg);
rc = NSLCD_PAM_PERM_DENIED;
goto done;
@ -844,7 +842,7 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op,uid_t calleruid)
rc = NSLCD_PAM_PERM_DENIED;
done:;
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(), rc (%d)\n", rc, 0, 0);
Debug(LDAP_DEBUG_TRACE,"nssov_pam_pwmod(), rc (%d)\n", rc );
WRITE_INT32(fp,NSLCD_VERSION);
WRITE_INT32(fp,NSLCD_ACTION_PAM_PWMOD);
WRITE_INT32(fp,NSLCD_RESULT_BEGIN);

18
contrib/slapd-modules/nssov/passwd.c
View file

@ -225,7 +225,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (!a)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[UID_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[UID_KEY].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -266,7 +266,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if ( !a )
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[UIDN_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[UIDN_KEY].an_desc->ad_cname.bv_val );
return 0;
}
uids = a->a_vals;
@ -282,19 +282,19 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (!a)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val );
return 0;
}
else if (a->a_numvals != 1)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val );
}
gid=(gid_t)strtol(a->a_vals[0].bv_val,&tmp,0);
if ((a->a_vals[0].bv_val[0]=='\0')||(*tmp!='\0'))
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s contains non-numeric %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[GIDN_KEY].an_desc->ad_cname.bv_val );
return 0;
}
/* get the gecos for this entry (fall back to cn) */
@ -322,7 +322,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (!a)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val );
homedir=default_passwd_homeDirectory;
}
else
@ -330,7 +330,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (a->a_numvals > 1)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[DIR_KEY].an_desc->ad_cname.bv_val );
}
homedir=a->a_vals[0];
if (homedir.bv_val[0]=='\0')
@ -347,7 +347,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (a->a_numvals > 1)
{
Debug(LDAP_DEBUG_ANY,"passwd entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[SHL_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[SHL_KEY].an_desc->ad_cname.bv_val );
}
shell=a->a_vals[0];
if (shell.bv_val[0]=='\0')
@ -359,7 +359,7 @@ static int write_passwd(nssov_passwd_cbp *cbp,Entry *entry)
if (!isvalidusername(&names[i]))
{
Debug(LDAP_DEBUG_ANY,"nssov: passwd entry %s contains invalid user name: \"%s\"\n",
entry->e_name.bv_val,names[i].bv_val,0);
entry->e_name.bv_val,names[i].bv_val );
}
else
{

8
contrib/slapd-modules/nssov/protocol.c
View file

@ -63,7 +63,7 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -86,17 +86,17 @@ static int write_protocol(nssov_protocol_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"protocol entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
} else if ( a->a_numvals > 1 ) {
Debug(LDAP_DEBUG_ANY,"protocol entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
}
proto=(int)strtol(a->a_vals[0].bv_val,&tmp,0);
if (*tmp)
{
Debug(LDAP_DEBUG_ANY,"protocol entry %s contains non-numeric %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
/* write the entry */

8
contrib/slapd-modules/nssov/rpc.c
View file

@ -65,7 +65,7 @@ static int write_rpc(nssov_rpc_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"rpc entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -88,17 +88,17 @@ static int write_rpc(nssov_rpc_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"rpc entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
} else if ( a->a_numvals > 1 ) {
Debug(LDAP_DEBUG_ANY,"rpc entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
}
number=(int)strtol(a->a_vals[0].bv_val,&tmp,0);
if (*tmp)
{
Debug(LDAP_DEBUG_ANY,"rpc entry %s contains non-numeric %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
/* write the entry */

10
contrib/slapd-modules/nssov/service.c
View file

@ -127,7 +127,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"service entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[0].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;
@ -150,17 +150,17 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"service entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
} else if ( a->a_numvals > 1 ) {
Debug(LDAP_DEBUG_ANY,"service entry %s contains multiple %s values\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
}
port=(int)strtol(a->a_vals[0].bv_val,&tmp,0);
if (*tmp)
{
Debug(LDAP_DEBUG_ANY,"service entry %s contains non-numeric %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[1].an_desc->ad_cname.bv_val );
return 0;
}
/* get protocols */
@ -170,7 +170,7 @@ static int write_service(nssov_service_cbp *cbp,Entry *entry)
if ( !a || !a->a_vals )
{
Debug(LDAP_DEBUG_ANY,"service entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[2].an_desc->ad_cname.bv_val, 0 );
entry->e_name.bv_val, cbp->mi->mi_attrs[2].an_desc->ad_cname.bv_val );
return 0;
}
protos = a->a_vals;

6
contrib/slapd-modules/nssov/shadow.c
View file

@ -94,7 +94,7 @@ static long to_date(struct berval *date,AttributeDescription *attr)
if ((buffer[0]=='\0')||(*tmp!='\0'))
{
Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value\n",
attr->ad_cname.bv_val,0,0);
attr->ad_cname.bv_val );
return 0;
}
return value/864-134774;
@ -105,7 +105,7 @@ static long to_date(struct berval *date,AttributeDescription *attr)
if ((date->bv_val[0]=='\0')||(*tmp!='\0'))
{
Debug(LDAP_DEBUG_ANY,"shadow entry contains non-numeric %s value\n",
attr->ad_cname.bv_val,0,0);
attr->ad_cname.bv_val );
return 0;
}
return value;
@ -176,7 +176,7 @@ static int write_shadow(nssov_shadow_cbp *cbp,Entry *entry)
if (!a)
{
Debug(LDAP_DEBUG_ANY,"shadow entry %s does not contain %s value\n",
entry->e_name.bv_val, cbp->mi->mi_attrs[UID_KEY].an_desc->ad_cname.bv_val,0);
entry->e_name.bv_val, cbp->mi->mi_attrs[UID_KEY].an_desc->ad_cname.bv_val );
return 0;
}
names = a->a_vals;

2
contrib/slapd-modules/passwd/totp/slapd-totp.c
View file

@ -744,7 +744,7 @@ static int totp_db_open(
if (rc) {
snprintf(cr->msg, sizeof(cr->msg), "unable to find or register authTimestamp attribute: %s (%d)",
text, rc);
Debug(LDAP_DEBUG_ANY, "totp: %s.\n", cr->msg, 0, 0);
Debug(LDAP_DEBUG_ANY, "totp: %s.\n", cr->msg );
}
ad_authTimestamp->ad_type->sat_flags |= SLAP_AT_MANAGEABLE;
}

8
contrib/slapd-modules/proxyOld/proxyOld.c
View file

@ -88,12 +88,12 @@ proxyOld_parse(
if ( BER_BVISEMPTY( &dn )) {
Debug( LDAP_DEBUG_TRACE,
"proxyOld_parse: conn=%lu anonymous\n",
op->o_connid, 0, 0 );
op->o_connid );
authzDN.bv_val = ch_strdup("");
} else {
Debug( LDAP_DEBUG_ARGS,
"proxyOld_parse: conn %lu ctrl DN=\"%s\"\n",
op->o_connid, dn.bv_val, 0 );
op->o_connid, dn.bv_val );
rc = dnNormalize( 0, NULL, NULL, &dn, &authzDN, op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
goto done;
@ -112,9 +112,9 @@ proxyOld_parse(
op->o_ndn = authzDN;
ber_dupbv( &op->o_dn, &authzDN );
Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu PROXYOLD dn=\"%s\"\n",
Debug( LDAP_DEBUG_STATS, "conn=%lu op=%lu PROXYOLD dn=\"%s\"\n",
op->o_connid, op->o_opid,
authzDN.bv_len ? authzDN.bv_val : "anonymous", 0, 0 );
authzDN.bv_len ? authzDN.bv_val : "anonymous" );
rc = LDAP_SUCCESS;
done:
ber_free( ber, 1 );

16
contrib/slapd-modules/samba4/pguid.c
View file

@ -177,19 +177,19 @@ pguid_db_init(
ConfigReply *cr)
{
if ( SLAP_ISGLOBALOVERLAY( be ) ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"pguid_db_init: pguid cannot be used as global overlay.\n" );
return 1;
}
if ( be->be_nsuffix == NULL ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"pguid_db_init: database must have suffix\n" );
return 1;
}
if ( BER_BVISNULL( &be->be_rootndn ) || BER_BVISEMPTY( &be->be_rootndn ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"pguid_db_init: missing rootdn for database DN=\"%s\", YMMV\n",
be->be_suffix[ 0 ].bv_val );
}
@ -265,7 +265,7 @@ pguid_repair_cb( Operation *op, SlapReply *rs )
pcb->mods = mod;
Debug( LDAP_DEBUG_TRACE, "%s: pguid_repair_cb: scheduling entry DN=\"%s\" for repair\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
op->o_log_prefix, rs->sr_entry->e_name.bv_val );
}
if ( e != NULL ) {
@ -358,7 +358,7 @@ pguid_repair( BackendDB *be )
slap_mods_free( op->orm_modlist, 1 );
if ( rs2.sr_err == LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s: pguid_repair: entry DN=\"%s\" repaired\n",
op->o_log_prefix, pmod->ndn.bv_val, 0 );
op->o_log_prefix, pmod->ndn.bv_val );
nrepaired++;
} else {
@ -375,7 +375,7 @@ done_search:;
op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
filter_free_x( op, op->ors_filter, 1 );
Log1( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
"pguid: repaired=%d\n", nrepaired );
return rs.sr_err;
@ -388,7 +388,7 @@ pguid_db_open(
ConfigReply *cr )
{
if ( SLAP_SINGLE_SHADOW( be ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"pguid incompatible with shadow database \"%s\".\n",
be->be_suffix[ 0 ].bv_val );
return 1;
@ -427,7 +427,7 @@ pguid_initialize(void)
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"pguid_initialize: register_at #%d failed\n",
i, 0, 0 );
i );
return code;
}

25
contrib/slapd-modules/samba4/rdnval.c
View file

@ -198,7 +198,7 @@ rdnval_rdn2vals(
Debug( LDAP_DEBUG_TRACE,
"%s rdnval: can't figure out "
"type(s)/value(s) of rdn DN=\"%s\"\n",
op->o_log_prefix, dn->bv_val, 0 );
op->o_log_prefix, dn->bv_val );
rs->sr_err = LDAP_INVALID_DN_SYNTAX;
rs->sr_text = "unknown type(s) used in RDN";
@ -211,7 +211,7 @@ rdnval_rdn2vals(
Debug( LDAP_DEBUG_TRACE,
"%s rdnval: can't figure out "
"type(s)/value(s) of normalized rdn DN=\"%s\"\n",
op->o_log_prefix, ndn->bv_val, 0 );
op->o_log_prefix, ndn->bv_val );
rs->sr_err = LDAP_INVALID_DN_SYNTAX;
rs->sr_text = "unknown type(s) used in RDN";
@ -246,7 +246,7 @@ rdnval_rdn2vals(
Debug( LDAP_DEBUG_TRACE,
"%s rdnval: syntax of naming attribute '%s' "
"not compatible with directoryString",
op->o_log_prefix, rdn[ i ]->la_attr.bv_val, 0 );
op->o_log_prefix, rdn[ i ]->la_attr.bv_val );
continue;
}
@ -379,19 +379,19 @@ rdnval_db_init(
ConfigReply *cr)
{
if ( SLAP_ISGLOBALOVERLAY( be ) ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"rdnval_db_init: rdnval cannot be used as global overlay.\n" );
return 1;
}
if ( be->be_nsuffix == NULL ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"rdnval_db_init: database must have suffix\n" );
return 1;
}
if ( BER_BVISNULL( &be->be_rootndn ) || BER_BVISEMPTY( &be->be_rootndn ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"rdnval_db_init: missing rootdn for database DN=\"%s\", YMMV\n",
be->be_suffix[ 0 ].bv_val );
}
@ -458,7 +458,7 @@ rdnval_repair_cb( Operation *op, SlapReply *rs )
rcb->mods = mod;
Debug( LDAP_DEBUG_TRACE, "%s: rdnval_repair_cb: scheduling entry DN=\"%s\" for repair\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
op->o_log_prefix, rs->sr_entry->e_name.bv_val );
return 0;
}
@ -552,7 +552,7 @@ rdnval_repair( BackendDB *be )
slap_mods_free( op->orm_modlist, 1 );
if ( rs2.sr_err == LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s: rdnval_repair: entry DN=\"%s\" repaired\n",
op->o_log_prefix, rmod->ndn.bv_val, 0 );
op->o_log_prefix, rmod->ndn.bv_val );
nrepaired++;
} else {
@ -569,7 +569,7 @@ done_search:;
op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
filter_free_x( op, op->ors_filter, 1 );
Log1( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
"rdnval: repaired=%d\n", nrepaired );
return 0;
@ -582,7 +582,7 @@ rdnval_db_open(
ConfigReply *cr )
{
if ( SLAP_SINGLE_SHADOW( be ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"rdnval incompatible with shadow database \"%s\".\n",
be->be_suffix[ 0 ].bv_val );
return 1;
@ -617,7 +617,7 @@ rdnval_initialize(void)
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"rdnval_initialize: register_at #%d failed\n",
i, 0, 0 );
i );
return code;
}
@ -631,8 +631,7 @@ rdnval_initialize(void)
syn_IA5String = syn_find( "1.3.6.1.4.1.1466.115.121.1.26" );
if ( syn_IA5String == NULL ) {
Debug( LDAP_DEBUG_ANY,
"rdnval_initialize: unable to find syntax '1.3.6.1.4.1.1466.115.121.1.26' (IA5String)\n",
0, 0, 0 );
"rdnval_initialize: unable to find syntax '1.3.6.1.4.1.1466.115.121.1.26' (IA5String)\n" );
return LDAP_OTHER;
}

18
contrib/slapd-modules/samba4/vernum.c
View file

@ -160,19 +160,19 @@ vernum_db_init(
vernum_t *vn = NULL;
if ( SLAP_ISGLOBALOVERLAY( be ) ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"vernum_db_init: vernum cannot be used as global overlay.\n" );
return 1;
}
if ( be->be_nsuffix == NULL ) {
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"vernum_db_init: database must have suffix\n" );
return 1;
}
if ( BER_BVISNULL( &be->be_rootndn ) || BER_BVISEMPTY( &be->be_rootndn ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"vernum_db_init: missing rootdn for database DN=\"%s\", YMMV\n",
be->be_suffix[ 0 ].bv_val );
}
@ -227,7 +227,7 @@ vernum_repair_cb( Operation *op, SlapReply *rs )
rcb->mods = mod;
Debug( LDAP_DEBUG_TRACE, "%s: vernum_repair_cb: scheduling entry DN=\"%s\" for repair\n",
op->o_log_prefix, rs->sr_entry->e_name.bv_val, 0 );
op->o_log_prefix, rs->sr_entry->e_name.bv_val );
return 0;
}
@ -326,7 +326,7 @@ vernum_repair( BackendDB *be )
slap_mods_free( op->orm_modlist->sml_next, 1 );
if ( rs2.sr_err == LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s: vernum_repair: entry DN=\"%s\" repaired\n",
op->o_log_prefix, rmod->ndn.bv_val, 0 );
op->o_log_prefix, rmod->ndn.bv_val );
nrepaired++;
} else {
@ -343,7 +343,7 @@ done_search:;
op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
filter_free_x( op, op->ors_filter, 1 );
Log1( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_STATS, LDAP_LEVEL_INFO,
"vernum: repaired=%d\n", nrepaired );
return 0;
@ -358,7 +358,7 @@ vernum_db_open(
vernum_t *vn = (vernum_t *)on->on_bi.bi_private;
if ( SLAP_SINGLE_SHADOW( be ) ) {
Log1( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_ERR,
"vernum incompatible with shadow database \"%s\".\n",
be->be_suffix[ 0 ].bv_val );
return 1;
@ -372,7 +372,7 @@ vernum_db_open(
rc = slap_str2ad( "unicodePwd", &vn->vn_attr, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "vernum: unable to find attribute 'unicodePwd' (%d: %s)\n",
rc, text, 0 );
rc, text );
return 1;
}
@ -425,7 +425,7 @@ vernum_initialize(void)
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"vernum_initialize: register_at #%d failed\n",
i, 0, 0 );
i );
return code;
}

19
contrib/slapd-modules/smbk5pwd/smbk5pwd.c
View file

@ -460,7 +460,7 @@ static int smbk5pwd_exop_passwd(
/* shouldn't happen, this is a required attr */
Debug( LDAP_DEBUG_ANY, "%s smbk5pwd EXOP: "
"dn=\"%s\" missing krb5KeyVersionNumber\n",
op->o_log_prefix, e->e_name.bv_val, 0 );
op->o_log_prefix, e->e_name.bv_val );
}
ret = hdb_generate_key_set_password(context, ent.principal,
@ -845,7 +845,7 @@ smbk5pwd_cf_func( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: smbk5pwd: "
"<%s> only meaningful "
"when compiled with -DDO_SAMBA.\n",
c->log, c->argv[ 0 ], 0 );
c->log, c->argv[ 0 ] );
return 1;
#endif /* ! DO_SAMBA */
break;
@ -863,7 +863,7 @@ smbk5pwd_cf_func( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: smbk5pwd: "
"<%s> only meaningful "
"when compiled with -DDO_SAMBA.\n",
c->log, c->argv[ 0 ], 0 );
c->log, c->argv[ 0 ] );
return 1;
#endif /* ! DO_SAMBA */
break;
@ -979,8 +979,7 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
oc_krb5KDCEntry = oc_find( "krb5KDCEntry" );
if ( !oc_krb5KDCEntry ) {
Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
"unable to find \"krb5KDCEntry\" objectClass.\n",
0, 0, 0 );
"unable to find \"krb5KDCEntry\" objectClass.\n" );
return -1;
}
@ -1004,7 +1003,7 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
if (ret) {
Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
"unable to initialize krb5 context (%d).\n",
ret, 0, 0 );
ret );
oc_krb5KDCEntry = NULL;
return -1;
}
@ -1021,7 +1020,7 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
err_msg = (char *)krb5_get_err_text( context, ret );
Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
"unable to initialize krb5 admin context: %s (%d).\n",
err_str ? err_str : err_msg, ret, 0 );
err_str ? err_str : err_msg, ret );
if (err_str)
krb5_free_error_string( context, err_str );
krb5_free_context( context );
@ -1040,8 +1039,7 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
oc_sambaSamAccount = oc_find( "sambaSamAccount" );
if ( !oc_sambaSamAccount ) {
Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
"unable to find \"sambaSamAccount\" objectClass.\n",
0, 0, 0 );
"unable to find \"sambaSamAccount\" objectClass.\n" );
return -1;
}
@ -1069,8 +1067,7 @@ smbk5pwd_modules_init( smbk5pwd_t *pi )
oc_shadowAccount = oc_find( "shadowAccount" );
if ( !oc_shadowAccount ) {
Debug( LDAP_DEBUG_ANY, "smbk5pwd: "
"unable to find \"shadowAccount\" objectClass.\n",
0, 0, 0 );
"unable to find \"shadowAccount\" objectClass.\n" );
return -1;
}

22
contrib/slapd-modules/trace/trace.c
View file

@ -90,7 +90,7 @@ trace_op_func( Operation *op, SlapReply *rs )
switch ( op->o_tag ) {
case LDAP_REQ_EXTENDED:
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=EXTENDED dn=\"%s\" reqoid=%s\n",
op->o_log_prefix,
BER_BVISNULL( &op->o_req_ndn ) ? "(null)" : op->o_req_ndn.bv_val,
@ -98,7 +98,7 @@ trace_op_func( Operation *op, SlapReply *rs )
break;
default:
Log3( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=%s dn=\"%s\"\n",
op->o_log_prefix, op_str,
BER_BVISNULL( &op->o_req_ndn ) ? "(null)" : op->o_req_ndn.bv_val );
@ -117,7 +117,7 @@ trace_response( Operation *op, SlapReply *rs )
switch ( op->o_tag ) {
case LDAP_REQ_EXTENDED:
Log5( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=EXTENDED RESPONSE dn=\"%s\" reqoid=%s rspoid=%s err=%d\n",
op->o_log_prefix,
BER_BVISNULL( &op->o_req_ndn ) ? "(null)" : op->o_req_ndn.bv_val,
@ -129,14 +129,14 @@ trace_response( Operation *op, SlapReply *rs )
case LDAP_REQ_SEARCH:
switch ( rs->sr_type ) {
case REP_SEARCH:
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=SEARCH ENTRY dn=\"%s\"\n",
op->o_log_prefix,
rs->sr_entry->e_name.bv_val );
goto done;
case REP_SEARCHREF:
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=SEARCH REFERENCE ref=\"%s\"\n",
op->o_log_prefix,
rs->sr_ref[ 0 ].bv_val );
@ -151,7 +151,7 @@ trace_response( Operation *op, SlapReply *rs )
/* fallthru */
default:
Log4( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"%s trace op=%s RESPONSE dn=\"%s\" err=%d\n",
op->o_log_prefix,
op_str,
@ -167,7 +167,7 @@ done:;
static int
trace_db_init( BackendDB *be, ConfigReply *cr )
{
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"trace DB_INIT\n" );
return 0;
@ -181,7 +181,7 @@ trace_db_config(
int argc,
char **argv )
{
Log2( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"trace DB_CONFIG argc=%d argv[0]=\"%s\"\n",
argc, argv[ 0 ] );
@ -191,7 +191,7 @@ trace_db_config(
static int
trace_db_open( BackendDB *be, ConfigReply *cr )
{
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"trace DB_OPEN\n" );
return 0;
@ -200,7 +200,7 @@ trace_db_open( BackendDB *be, ConfigReply *cr )
static int
trace_db_close( BackendDB *be, ConfigReply *cr )
{
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"trace DB_CLOSE\n" );
return 0;
@ -209,7 +209,7 @@ trace_db_close( BackendDB *be, ConfigReply *cr )
static int
trace_db_destroy( BackendDB *be, ConfigReply *cr )
{
Log0( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
Log( LDAP_DEBUG_ANY, LDAP_LEVEL_INFO,
"trace DB_DESTROY\n" );
return 0;

5
contrib/slapd-modules/usn/usn.c
View file

@ -204,8 +204,7 @@ usn_db_init(
if ( SLAP_ISGLOBALOVERLAY( be ) ) {
Debug( LDAP_DEBUG_ANY,
"usn must be instantiated within a database.\n",
0, 0, 0 );
"usn must be instantiated within a database.\n" );
return 1;
}
@ -312,7 +311,7 @@ usn_init( void )
code = register_at( as[i].desc, as[i].adp, 0 );
if ( code ) {
Debug( LDAP_DEBUG_ANY,
"usn_init: register_at #%d failed\n", i, 0, 0 );
"usn_init: register_at #%d failed\n", i );
return code;
}
}

2
contrib/slapd-modules/vc/vc.c
View file

@ -425,7 +425,7 @@ vc_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"vc_initialize: unable to register VerifyCredentials exop: %d.\n",
rc, 0, 0 );
rc );
}
ldap_pvt_thread_mutex_init( &vc_mutex );

30
libraries/librewrite/config.c
View file

@ -68,14 +68,14 @@ rewrite_parse(
if ( argc < 2 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteEngine needs 'state'\n",
fname, lineno, 0 );
fname, lineno );
return -1;
} else if ( argc > 2 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] extra fields in rewriteEngine"
" will be discarded\n",
fname, lineno, 0 );
fname, lineno );
}
if ( strcasecmp( argv[ 1 ], "on" ) == 0 ) {
@ -88,7 +88,7 @@ rewrite_parse(
Debug( LDAP_DEBUG_ANY,
"[%s:%d] unknown 'state' in rewriteEngine;"
" assuming 'on'\n",
fname, lineno, 0 );
fname, lineno );
info->li_state = REWRITE_ON;
}
rc = REWRITE_SUCCESS;
@ -100,7 +100,7 @@ rewrite_parse(
if ( argc < 2 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteMaxPasses needs 'value'\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}
@ -114,7 +114,7 @@ rewrite_parse(
if ( info->li_max_passes <= 0 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] negative or null rewriteMaxPasses\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}
@ -129,7 +129,7 @@ rewrite_parse(
if ( info->li_max_passes_per_rule <= 0 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] negative or null rewriteMaxPassesPerRule\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}
@ -145,7 +145,7 @@ rewrite_parse(
if ( argc < 2 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteContext needs 'name'\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}
@ -179,7 +179,7 @@ rewrite_parse(
"[%s:%d] rewriteContext"
" needs 'name' after"
" 'alias'\n",
fname, lineno, 0 );
fname, lineno );
return -1;
} else if ( argc > 4 ) {
@ -189,7 +189,7 @@ rewrite_parse(
" after aliased name"
" will be"
" discarded\n",
fname, lineno, 0 );
fname, lineno );
}
aliased = rewrite_context_find( info,
@ -212,7 +212,7 @@ rewrite_parse(
"[%s:%d] extra fields"
" in rewriteContext"
" will be discarded\n",
fname, lineno, 0 );
fname, lineno );
}
}
rc = REWRITE_SUCCESS;
@ -225,21 +225,21 @@ rewrite_parse(
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteRule needs 'pattern'"
" 'subst' ['flags']\n",
fname, lineno, 0 );
fname, lineno );
return -1;
} else if ( argc > 4 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] extra fields in rewriteRule"
" will be discarded\n",
fname, lineno, 0 );
fname, lineno );
}
if ( rewrite_int_curr_context == NULL ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteRule outside a"
" context; will add to default\n",
fname, lineno, 0 );
fname, lineno );
rewrite_int_curr_context = rewrite_context_find( info,
REWRITE_DEFAULT_CONTEXT );
@ -261,7 +261,7 @@ rewrite_parse(
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteMap needs at least 'type'"
" and 'name' ['args']\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}
@ -276,7 +276,7 @@ rewrite_parse(
Debug( LDAP_DEBUG_ANY,
"[%s:%d] rewriteParam needs 'name'"
" and 'value'\n",
fname, lineno, 0 );
fname, lineno );
return -1;
}

6
libraries/librewrite/context.c
View file

@ -218,7 +218,7 @@ rewrite_context_apply(
Debug( LDAP_DEBUG_TRACE, "==> rewrite_context_apply"
" [depth=%d] string='%s'\n",
op->lo_depth, string, 0 );
op->lo_depth, string );
assert( op->lo_depth > 0 );
s = (char *)string;
@ -246,7 +246,7 @@ rewrite_context_apply(
case REWRITE_REGEXEC_ERR:
Debug( LDAP_DEBUG_ANY, "==> rewrite_context_apply"
" error ...\n", 0, 0, 0);
" error ...\n" );
/*
* Checks for special actions to be taken
@ -268,7 +268,7 @@ rewrite_context_apply(
case REWRITE_ACTION_IGNORE_ERR:
Debug( LDAP_DEBUG_ANY,
"==> rewrite_context_apply"
" ignoring error ...\n", 0, 0, 0 );
" ignoring error ...\n" );
do_continue = 1;
break;

4
libraries/librewrite/ldapmap.c
View file

@ -107,7 +107,7 @@ map_ldap_parse(
if ( argc < 1 ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] ldap map needs URI\n",
fname, lineno, 0 );
fname, lineno );
free( data );
return NULL;
}
@ -146,7 +146,7 @@ map_ldap_parse(
if ( data->lm_lud->lud_attrs[ 1 ] != NULL ) {
Debug( LDAP_DEBUG_ANY,
"[%s:%d] only one attribute allowed in URI\n",
fname, lineno, 0 );
fname, lineno );
map_ldap_free( data );
return NULL;
}

2
libraries/librewrite/subst.c
View file

@ -357,7 +357,7 @@ rewrite_subst_apply(
break;
default:
Debug( LDAP_DEBUG_ANY, "Not Implemented\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY, "Not Implemented\n" );
rc = REWRITE_ERR;
break;
}

4
libraries/librewrite/xmap.c
View file

@ -56,14 +56,14 @@ rewrite_xmap_parse(
assert( currpos != NULL );
Debug( LDAP_DEBUG_ARGS, "rewrite_xmap_parse: %s\n",
s, 0, 0 );
s );
*currpos = NULL;
map = calloc( sizeof( struct rewrite_map ), 1 );
if ( map == NULL ) {
Debug( LDAP_DEBUG_ANY, "rewrite_xmap_parse:"
" calloc failed\n", 0, 0, 0 );
" calloc failed\n" );
return NULL;
}

14
servers/slapd/abandon.c
View file

@ -39,7 +39,7 @@ do_abandon( Operation *op, SlapReply *rs )
const char *msg;
Debug( LDAP_DEBUG_TRACE, "%s do_abandon\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
/*
* Parse the abandon request. It looks like this:
@ -49,26 +49,26 @@ do_abandon( Operation *op, SlapReply *rs )
if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, "%s do_abandon: ber_scanf failed\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
return SLAPD_DISCONNECT;
}
Statslog( LDAP_DEBUG_STATS, "%s ABANDON msg=%ld\n",
op->o_log_prefix, (long) id, 0, 0, 0 );
Debug( LDAP_DEBUG_STATS, "%s ABANDON msg=%ld\n",
op->o_log_prefix, (long) id );
if( get_ctrls( op, rs, 0 ) != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "%s do_abandon: get_ctrls failed\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
return rs->sr_err;
}
Debug( LDAP_DEBUG_ARGS, "%s do_abandon: id=%ld\n",
op->o_log_prefix, (long) id, 0 );
op->o_log_prefix, (long) id );
if( id <= 0 ) {
Debug( LDAP_DEBUG_ANY, "%s do_abandon: bad msgid %ld\n",
op->o_log_prefix, (long) id, 0 );
op->o_log_prefix, (long) id );
return LDAP_SUCCESS;
}

97
servers/slapd/aci.c
View file

@ -281,20 +281,19 @@ aci_list_get_attr_rights(
Debug( LDAP_DEBUG_ACL,
" <= aci_list_get_attr_rights "
"test %s for %s -> failed\n",
bv.bv_val, attr->bv_val, 0 );
bv.bv_val, attr->bv_val );
continue;
}
Debug( LDAP_DEBUG_ACL,
" <= aci_list_get_attr_rights "
"test %s for %s -> ok\n",
bv.bv_val, attr->bv_val, 0 );
bv.bv_val, attr->bv_val );
if ( acl_get_part( list, i, ';', &bv ) < 0 ) {
Debug( LDAP_DEBUG_ACL,
" <= aci_list_get_attr_rights "
"test no rights\n",
0, 0, 0 );
"test no rights\n" );
continue;
}
@ -302,7 +301,7 @@ aci_list_get_attr_rights(
Debug( LDAP_DEBUG_ACL,
" <= aci_list_get_attr_rights "
"rights %s to mask 0x%x\n",
bv.bv_val, mask, 0 );
bv.bv_val, mask );
}
return mask;
@ -730,7 +729,7 @@ aci_init( void )
rc = register_at( aci_at.desc, aci_at.ad, 0 );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"aci_init: at_register failed\n", 0, 0, 0 );
"aci_init: at_register failed\n" );
return rc;
}
@ -850,7 +849,7 @@ dynacl_aci_mask(
Debug( LDAP_DEBUG_ACL, " <= aci_mask grant %s deny %s\n",
accessmask2str( tgrant, accessmaskbuf, 1 ),
accessmask2str( tdeny, accessmaskbuf1, 1 ), 0 );
accessmask2str( tdeny, accessmaskbuf1, 1 ) );
}
/* If the entry level aci didn't contain anything valid for the
@ -888,7 +887,7 @@ dynacl_aci_mask(
op->o_ndn = op->o_bd->be_rootndn;
}
Debug( LDAP_DEBUG_ACL, " checking ACI of \"%s\"\n", parent_ndn.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, " checking ACI of \"%s\"\n", parent_ndn.bv_val );
ret = backend_attribute( op, NULL, &parent_ndn, ad, &bvals, ACL_AUTH );
if ( !BER_BVISNULL( &op->o_bd->be_rootndn ) ) {
@ -921,7 +920,7 @@ dynacl_aci_mask(
}
Debug( LDAP_DEBUG_ACL, "<= aci_mask grant %s deny %s\n",
accessmask2str( tgrant, accessmaskbuf, 1 ),
accessmask2str( tdeny, accessmaskbuf1, 1 ), 0 );
accessmask2str( tdeny, accessmaskbuf1, 1 ) );
}
break;
@ -929,13 +928,13 @@ dynacl_aci_mask(
/* just go on if the aci-Attribute is not present in
* the current entry
*/
Debug( LDAP_DEBUG_ACL, "no such attribute\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "no such attribute\n" );
stop = 0;
break;
case LDAP_NO_SUCH_OBJECT:
/* We have reached the base object */
Debug( LDAP_DEBUG_ACL, "no such object\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "no such object\n" );
stop = 1;
break;
@ -1060,7 +1059,7 @@ OpenLDAPaciValidatePerms(
break;
default:
Debug( LDAP_DEBUG_ACL, "aciValidatePerms: perms needs to be one of x,d,c,s,r,w in '%s'\n", perms->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidatePerms: perms needs to be one of x,d,c,s,r,w in '%s'\n", perms->bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1074,7 +1073,7 @@ OpenLDAPaciValidatePerms(
assert( i != perms->bv_len );
if ( perms->bv_val[ i ] != ',' ) {
Debug( LDAP_DEBUG_ACL, "aciValidatePerms: missing comma in '%s'\n", perms->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidatePerms: missing comma in '%s'\n", perms->bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1103,7 +1102,7 @@ OpenLDAPaciValidateRight(
if ( acl_get_part( action, 0, ';', &bv ) < 0 ||
bv_getcaseidx( &bv, ACIgrantdeny ) == -1 )
{
Debug( LDAP_DEBUG_ACL, "aciValidateRight: '%s' must be either 'grant' or 'deny'\n", bv.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidateRight: '%s' must be either 'grant' or 'deny'\n", bv.bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1137,13 +1136,13 @@ OpenLDAPaciValidateRight(
{
if ( slap_bv2ad( &attr, &ad, &text ) != LDAP_SUCCESS )
{
Debug( LDAP_DEBUG_ACL, "aciValidateRight: unknown attribute: '%s'\n", attr.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidateRight: unknown attribute: '%s'\n", attr.bv_val );
return LDAP_INVALID_SYNTAX;
}
} else {
if ( slap_bv2ad( &left, &ad, &text ) != LDAP_SUCCESS )
{
Debug( LDAP_DEBUG_ACL, "aciValidateRight: unknown attribute: '%s'\n", left.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidateRight: unknown attribute: '%s'\n", left.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1156,7 +1155,7 @@ OpenLDAPaciValidateRight(
return LDAP_SUCCESS;
} else {
Debug( LDAP_DEBUG_ACL, "aciValidateRight: perms:attr need to be pairs in '%s'\n", action->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidateRight: perms:attr need to be pairs in '%s'\n", action->bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1177,12 +1176,12 @@ OpenLDAPaciNormalizeRight(
/* grant|deny */
if ( acl_get_part( action, 0, ';', &grantdeny ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: missing ';' in '%s'\n", action->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: missing ';' in '%s'\n", action->bv_val );
return LDAP_INVALID_SYNTAX;
}
idx = bv_getcaseidx( &grantdeny, ACIgrantdeny );
if ( idx == -1 ) {
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: '%s' must be grant or deny\n", grantdeny.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: '%s' must be grant or deny\n", grantdeny.bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1243,7 +1242,7 @@ OpenLDAPaciNormalizeRight(
if ( slap_bv2ad( &attr, &ad, &text ) != LDAP_SUCCESS )
{
ber_memfree_x( nattrs.bv_val, ctx );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: unknown attribute: '%s'\n", attr.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: unknown attribute: '%s'\n", attr.bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1251,7 +1250,7 @@ OpenLDAPaciNormalizeRight(
if ( slap_bv2ad( &left, &ad, &text ) != LDAP_SUCCESS )
{
ber_memfree_x( nattrs.bv_val, ctx );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: unknown attribute: '%s'\n", left.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: unknown attribute: '%s'\n", left.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1298,7 +1297,7 @@ OpenLDAPaciNormalizeRight(
return LDAP_SUCCESS;
} else {
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: perms:attr need to be pairs in '%s'\n", action->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciNormalizeRight: perms:attr need to be pairs in '%s'\n", action->bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1411,7 +1410,7 @@ OpenLDAPaciValidate(
int rc;
if ( BER_BVISEMPTY( val ) ) {
Debug( LDAP_DEBUG_ACL, "aciValidatet: value is empty\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidatet: value is empty\n" );
return LDAP_INVALID_SYNTAX;
}
@ -1423,7 +1422,7 @@ OpenLDAPaciValidate(
* I'd replace it with X-ORDERED VALUES so that
* it's guaranteed values are maintained and used
* in the desired order */
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid oid '%s'\n", oid.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid oid '%s'\n", oid.bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1431,7 +1430,7 @@ OpenLDAPaciValidate(
if ( acl_get_part( val, 1, '#', &scope ) < 0 ||
bv_getcaseidx( &scope, OpenLDAPaciscopes ) == -1 )
{
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid scope '%s'\n", scope.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid scope '%s'\n", scope.bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1444,7 +1443,7 @@ OpenLDAPaciValidate(
/* type */
if ( acl_get_part( val, 3, '#', &type ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: missing type in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: missing type in '%s'\n", val->bv_val );
return LDAP_INVALID_SYNTAX;
}
idx = bv_getcaseidx( &type, OpenLDAPacitypes );
@ -1452,13 +1451,13 @@ OpenLDAPaciValidate(
struct berval isgr;
if ( acl_get_part( &type, 0, '/', &isgr ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid type '%s'\n", type.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid type '%s'\n", type.bv_val );
return LDAP_INVALID_SYNTAX;
}
idx = bv_getcaseidx( &isgr, OpenLDAPacitypes );
if ( idx == -1 || idx >= LAST_OPTIONAL ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid type '%s'\n", isgr.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid type '%s'\n", isgr.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1466,7 +1465,7 @@ OpenLDAPaciValidate(
/* subject */
bv_get_tail( val, &type, &subject );
if ( subject.bv_val[ 0 ] != '#' ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: missing subject in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: missing subject in '%s'\n", val->bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1477,13 +1476,13 @@ OpenLDAPaciValidate(
rc = slap_bv2ad( &subject, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown dn attribute '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown dn attribute '%s'\n", subject.bv_val );
return LDAP_INVALID_SYNTAX;
}
if ( ad->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
/* FIXME: allow nameAndOptionalUID? */
Debug( LDAP_DEBUG_ACL, "aciValidate: wrong syntax for dn attribute '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: wrong syntax for dn attribute '%s'\n", subject.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1517,13 +1516,13 @@ OpenLDAPaciValidate(
rc = slap_bv2ad( &atbv, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown group attribute '%s'\n", atbv.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown group attribute '%s'\n", atbv.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
if ( oc_bvfind( &ocbv ) == NULL ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown group '%s'\n", ocbv.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: unknown group '%s'\n", ocbv.bv_val );
return LDAP_INVALID_SYNTAX;
}
}
@ -1531,7 +1530,7 @@ OpenLDAPaciValidate(
if ( BER_BVISEMPTY( &subject ) ) {
/* empty DN invalid */
Debug( LDAP_DEBUG_ACL, "aciValidate: missing dn in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: missing dn in '%s'\n", val->bv_val );
return LDAP_INVALID_SYNTAX;
}
@ -1541,7 +1540,7 @@ OpenLDAPaciValidate(
/* FIXME: pass DN syntax? */
rc = dnValidate( NULL, &subject );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid dn '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciValidate: invalid dn '%s'\n", subject.bv_val );
}
return rc;
}
@ -1570,7 +1569,7 @@ OpenLDAPaciPrettyNormal(
BER_BVZERO( out );
if ( BER_BVISEMPTY( val ) ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: value is empty\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: value is empty\n" );
return LDAP_INVALID_SYNTAX;
}
@ -1578,25 +1577,25 @@ OpenLDAPaciPrettyNormal(
if ( acl_get_part( val, 0, '#', &oid ) < 0 ||
numericoidValidate( NULL, &oid ) != LDAP_SUCCESS )
{
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid oid '%s'\n", oid.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid oid '%s'\n", oid.bv_val );
return LDAP_INVALID_SYNTAX;
}
/* scope: normalize by replacing with OpenLDAPaciscopes */
if ( acl_get_part( val, 1, '#', &scope ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing scope in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing scope in '%s'\n", val->bv_val );
return LDAP_INVALID_SYNTAX;
}
idx = bv_getcaseidx( &scope, OpenLDAPaciscopes );
if ( idx == -1 ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid scope '%s'\n", scope.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid scope '%s'\n", scope.bv_val );
return LDAP_INVALID_SYNTAX;
}
scope = *OpenLDAPaciscopes[ idx ];
/* rights */
if ( acl_get_part( val, 2, '#', &rights ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing rights in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing rights in '%s'\n", val->bv_val );
return LDAP_INVALID_SYNTAX;
}
if ( OpenLDAPaciNormalizeRights( &rights, &nrights, ctx )
@ -1607,7 +1606,7 @@ OpenLDAPaciPrettyNormal(
/* type */
if ( acl_get_part( val, 3, '#', &type ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing type in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing type in '%s'\n", val->bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
@ -1616,14 +1615,14 @@ OpenLDAPaciPrettyNormal(
struct berval isgr;
if ( acl_get_part( &type, 0, '/', &isgr ) < 0 ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid type '%s'\n", type.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid type '%s'\n", type.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
idx = bv_getcaseidx( &isgr, OpenLDAPacitypes );
if ( idx == -1 || idx >= LAST_OPTIONAL ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid type '%s'\n", isgr.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid type '%s'\n", isgr.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
@ -1634,7 +1633,7 @@ OpenLDAPaciPrettyNormal(
bv_get_tail( val, &type, &subject );
if ( BER_BVISEMPTY( &subject ) || subject.bv_val[ 0 ] != '#' ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing subject in '%s'\n", val->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: missing subject in '%s'\n", val->bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
@ -1655,7 +1654,7 @@ OpenLDAPaciPrettyNormal(
freesubject = 1;
} else {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid subject dn '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid subject dn '%s'\n", subject.bv_val );
goto cleanup;
}
@ -1688,7 +1687,7 @@ OpenLDAPaciPrettyNormal(
rc = slap_bv2ad( &atbv, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: unknown group attribute '%s'\n", atbv.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: unknown group attribute '%s'\n", atbv.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
@ -1698,7 +1697,7 @@ OpenLDAPaciPrettyNormal(
oc = oc_bvfind( &ocbv );
if ( oc == NULL ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid group '%s'\n", ocbv.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: invalid group '%s'\n", ocbv.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
@ -1734,14 +1733,14 @@ OpenLDAPaciPrettyNormal(
rc = slap_bv2ad( &subject, &ad, &text );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: unknown dn attribute '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: unknown dn attribute '%s'\n", subject.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}
if ( ad->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
/* FIXME: allow nameAndOptionalUID? */
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: wrong syntax for dn attribute '%s'\n", subject.bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "aciPrettyNormal: wrong syntax for dn attribute '%s'\n", subject.bv_val );
rc = LDAP_INVALID_SYNTAX;
goto cleanup;
}

98
servers/slapd/acl.c
View file

@ -170,7 +170,7 @@ slap_access_allowed(
/* grant database root access */
if ( be_isroot( op ) ) {
Debug( LDAP_DEBUG_ACL, "<= root access granted\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "<= root access granted\n" );
mask = ACL_LVL_MANAGE;
goto done;
}
@ -191,7 +191,7 @@ slap_access_allowed(
{
Debug( LDAP_DEBUG_ACL, "NoUserMod Operational attribute:"
" %s access granted\n",
attr, 0, 0 );
attr );
goto done;
}
@ -261,10 +261,10 @@ slap_access_allowed(
for ( n = dn_data[i].rm_so;
n < dn_data[i].rm_eo; n++ ) {
Debug( LDAP_DEBUG_ACL, "%c",
data[n], 0, 0 );
data[n] );
}
}
Debug( LDAP_DEBUG_ACL, "\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "\n" );
}
/* val matches */
@ -279,10 +279,10 @@ slap_access_allowed(
for ( n = val_data[i].rm_so;
n < val_data[i].rm_eo; n++ ) {
Debug( LDAP_DEBUG_ACL, "%c",
data[n], 0, 0 );
data[n] );
}
}
Debug( LDAP_DEBUG_ACL, "\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "\n" );
}
control = slap_acl_mask( a, prev, &mask, op,
@ -299,12 +299,12 @@ slap_access_allowed(
if ( ACL_IS_INVALID( mask ) ) {
Debug( LDAP_DEBUG_ACL,
"=> slap_access_allowed: \"%s\" (%s) invalid!\n",
e->e_dn, attr, 0 );
e->e_dn, attr );
ACL_PRIV_ASSIGN( mask, *maskp );
} else if ( control == ACL_BREAK ) {
Debug( LDAP_DEBUG_ACL,
"=> slap_access_allowed: no more rules\n", 0, 0, 0 );
"=> slap_access_allowed: no more rules\n" );
goto done;
}
@ -413,12 +413,12 @@ access_allowed_mask(
{
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: result was in cache (%s)\n",
attr, 0, 0 );
attr );
return state->as_result;
} else {
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: result not in cache (%s)\n",
attr, 0, 0 );
attr );
}
}
@ -461,12 +461,12 @@ access_allowed_mask(
if ( ACL_IS_INVALID( mask ) ) {
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: \"%s\" (%s) invalid!\n",
e->e_dn, attr, 0 );
e->e_dn, attr );
ACL_INIT( mask );
} else {
Debug( LDAP_DEBUG_ACL,
"=> access_allowed: no more rules\n", 0, 0, 0 );
"=> access_allowed: no more rules\n" );
goto done;
}
@ -559,7 +559,7 @@ slap_acl_get(
ber_len_t patlen;
Debug( LDAP_DEBUG_ACL, "=> dn: [%d] %s\n",
*count, a->acl_dn_pat.bv_val, 0 );
*count, a->acl_dn_pat.bv_val );
patlen = a->acl_dn_pat.bv_len;
if ( dnlen < patlen )
continue;
@ -602,7 +602,7 @@ slap_acl_get(
}
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] matched\n",
*count, 0, 0 );
*count );
}
if ( a->acl_attrs && !ad_inlist( desc, a->acl_attrs ) ) {
@ -629,7 +629,7 @@ slap_acl_get(
if ( a->acl_attrval_style == ACL_STYLE_REGEX ) {
Debug( LDAP_DEBUG_ACL,
"acl_get: valpat %s\n",
a->acl_attrval.bv_val, 0, 0 );
a->acl_attrval.bv_val );
if ( regexec ( &a->acl_attrval_re,
val->bv_val,
matches->val_count,
@ -643,7 +643,7 @@ slap_acl_get(
const char *text;
Debug( LDAP_DEBUG_ACL,
"acl_get: val %s\n",
a->acl_attrval.bv_val, 0, 0 );
a->acl_attrval.bv_val );
if ( a->acl_attrs[0].an_desc->ad_type->sat_syntax != slap_schema.si_syn_distinguishedName ) {
if (value_match( &match, desc,
@ -701,7 +701,7 @@ slap_acl_get(
}
Debug( LDAP_DEBUG_ACL, "=> acl_get: [%d] attr %s\n",
*count, attr, 0);
*count, attr );
return a;
}
@ -711,7 +711,7 @@ slap_acl_get(
goto retry;
}
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "<= acl_get: done.\n" );
return( NULL );
}
@ -1033,7 +1033,7 @@ acl_mask_dnattr(
return 1;
}
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n", attr, 0, 0 );
Debug( LDAP_DEBUG_ACL, "<= check a_dn_at: %s\n", attr );
bv = *opndn;
/* see if asker is listed in dnattr */
@ -1141,7 +1141,7 @@ slap_acl_mask(
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: access to entry \"%s\", attr \"%s\" requested\n",
e->e_dn, attr, 0 );
e->e_dn, attr );
Debug( LDAP_DEBUG_ACL,
"=> acl_mask: to %s by \"%s\", (%s) \n",
@ -1191,7 +1191,7 @@ slap_acl_mask(
/* AND <who> clauses */
if ( !BER_BVISEMPTY( &b->a_dn_pat ) ) {
Debug( LDAP_DEBUG_ACL, "<= check a_dn_pat: %s\n",
b->a_dn_pat.bv_val, 0, 0);
b->a_dn_pat.bv_val );
/*
* if access applies to the entry itself, and the
* user is bound as somebody in the same namespace as
@ -1215,7 +1215,7 @@ slap_acl_mask(
struct berval ndn;
Debug( LDAP_DEBUG_ACL, "<= check a_realdn_pat: %s\n",
b->a_realdn_pat.bv_val, 0, 0);
b->a_realdn_pat.bv_val );
/*
* if access applies to the entry itself, and the
* user is bound as somebody in the same namespace as
@ -1247,7 +1247,7 @@ slap_acl_mask(
continue;
}
Debug( LDAP_DEBUG_ACL, "<= check a_sockurl_pat: %s\n",
b->a_sockurl_pat.bv_val, 0, 0 );
b->a_sockurl_pat.bv_val );
if ( !ber_bvccmp( &b->a_sockurl_pat, '*' ) ) {
if ( b->a_sockurl_style == ACL_STYLE_REGEX) {
@ -1287,7 +1287,7 @@ slap_acl_mask(
continue;
}
Debug( LDAP_DEBUG_ACL, "<= check a_domain_pat: %s\n",
b->a_domain_pat.bv_val, 0, 0 );
b->a_domain_pat.bv_val );
if ( !ber_bvccmp( &b->a_domain_pat, '*' ) ) {
if ( b->a_domain_style == ACL_STYLE_REGEX) {
if ( !regex_matches( &b->a_domain_pat, op->o_conn->c_peer_domain.bv_val,
@ -1341,7 +1341,7 @@ slap_acl_mask(
continue;
}
Debug( LDAP_DEBUG_ACL, "<= check a_peername_path: %s\n",
b->a_peername_pat.bv_val, 0, 0 );
b->a_peername_pat.bv_val );
if ( !ber_bvccmp( &b->a_peername_pat, '*' ) ) {
if ( b->a_peername_style == ACL_STYLE_REGEX ) {
if ( !regex_matches( &b->a_peername_pat, op->o_conn->c_peer_name.bv_val,
@ -1493,7 +1493,7 @@ slap_acl_mask(
continue;
}
Debug( LDAP_DEBUG_ACL, "<= check a_sockname_path: %s\n",
b->a_sockname_pat.bv_val, 0, 0 );
b->a_sockname_pat.bv_val );
if ( !ber_bvccmp( &b->a_sockname_pat, '*' ) ) {
if ( b->a_sockname_style == ACL_STYLE_REGEX) {
if ( !regex_matches( &b->a_sockname_pat, op->o_conn->c_sock_name.bv_val,
@ -1562,7 +1562,7 @@ slap_acl_mask(
}
Debug( LDAP_DEBUG_ACL, "<= check a_group_pat: %s\n",
b->a_group_pat.bv_val, 0, 0 );
b->a_group_pat.bv_val );
/* b->a_group is an unexpanded entry name, expanded it should be an
* entry with objectclass group* and we test to see if odn is one of
@ -1657,7 +1657,7 @@ slap_acl_mask(
char buf[ACL_BUF_SIZE];
Debug( LDAP_DEBUG_ACL, "<= check a_set_pat: %s\n",
b->a_set_pat.bv_val, 0, 0 );
b->a_set_pat.bv_val );
if ( b->a_set_style == ACL_STYLE_EXPAND ) {
AclRegexMatches tmp_matches,
@ -1726,7 +1726,7 @@ slap_acl_mask(
if ( b->a_authz.sai_ssf ) {
Debug( LDAP_DEBUG_ACL, "<= check a_authz.sai_ssf: ACL %u > OP %u\n",
b->a_authz.sai_ssf, op->o_ssf, 0 );
b->a_authz.sai_ssf, op->o_ssf );
if ( b->a_authz.sai_ssf > op->o_ssf ) {
continue;
}
@ -1735,7 +1735,7 @@ slap_acl_mask(
if ( b->a_authz.sai_transport_ssf ) {
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_transport_ssf: ACL %u > OP %u\n",
b->a_authz.sai_transport_ssf, op->o_transport_ssf, 0 );
b->a_authz.sai_transport_ssf, op->o_transport_ssf );
if ( b->a_authz.sai_transport_ssf > op->o_transport_ssf ) {
continue;
}
@ -1744,7 +1744,7 @@ slap_acl_mask(
if ( b->a_authz.sai_tls_ssf ) {
Debug( LDAP_DEBUG_ACL,
"<= check a_authz.sai_tls_ssf: ACL %u > OP %u\n",
b->a_authz.sai_tls_ssf, op->o_tls_ssf, 0 );
b->a_authz.sai_tls_ssf, op->o_tls_ssf );
if ( b->a_authz.sai_tls_ssf > op->o_tls_ssf ) {
continue;
}
@ -1753,7 +1753,7 @@ slap_acl_mask(
if ( b->a_authz.sai_sasl_ssf ) {
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 );
b->a_authz.sai_sasl_ssf, op->o_sasl_ssf );
if ( b->a_authz.sai_sasl_ssf > op->o_sasl_ssf ) {
continue;
}
@ -1764,8 +1764,7 @@ slap_acl_mask(
slap_dynacl_t *da;
slap_access_t tgrant, tdeny;
Debug( LDAP_DEBUG_ACL, "<= check a_dynacl\n",
0, 0, 0 );
Debug( LDAP_DEBUG_ACL, "<= check a_dynacl\n" );
/* this case works different from the others above.
* since dynamic ACL's themselves give permissions, we need
@ -1790,7 +1789,7 @@ slap_acl_mask(
ACL_INVALIDATE(deny);
Debug( LDAP_DEBUG_ACL, " <= check a_dynacl: %s\n",
da->da_name, 0, 0 );
da->da_name );
/*
* XXXmanu Only DN matches are supplied
@ -1870,7 +1869,7 @@ slap_acl_mask(
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: [%d] mask: %s\n",
i, accessmask2str(*mask, accessmaskbuf, 1), 0 );
i, accessmask2str(*mask, accessmaskbuf, 1) );
if( b->a_type == ACL_CONTINUE ) {
continue;
@ -1888,7 +1887,7 @@ slap_acl_mask(
Debug( LDAP_DEBUG_ACL,
"<= acl_mask: no more <who> clauses, returning %s (stop)\n",
accessmask2str(*mask, accessmaskbuf, 1), 0, 0 );
accessmask2str(*mask, accessmaskbuf, 1) );
return ACL_STOP;
}
@ -1926,8 +1925,7 @@ acl_check_modlist(
/* short circuit root database access */
if ( be_isroot( op ) ) {
Debug( LDAP_DEBUG_ACL,
"<= acl_access_allowed: granted to database root\n",
0, 0, 0 );
"<= acl_access_allowed: granted to database root\n" );
goto done;
}
@ -1950,7 +1948,7 @@ acl_check_modlist(
if ( mlist->sml_flags & SLAP_MOD_INTERNAL ) {
Debug( LDAP_DEBUG_ACL, "acl: internal mod %s:"
" modify access granted\n",
mlist->sml_desc->ad_cname.bv_val, 0, 0 );
mlist->sml_desc->ad_cname.bv_val );
continue;
}
@ -1964,7 +1962,7 @@ acl_check_modlist(
{
Debug( LDAP_DEBUG_ACL, "acl: no-user-mod %s:"
" modify access granted\n",
mlist->sml_desc->ad_cname.bv_val, 0, 0 );
mlist->sml_desc->ad_cname.bv_val );
continue;
}
@ -2185,7 +2183,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
if ( rc != LDAP_URL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"%s acl_set_gather: unable to parse URL=\"%s\"\n",
cp->asc_op->o_log_prefix, name->bv_val, 0 );
cp->asc_op->o_log_prefix, name->bv_val );
rc = LDAP_PROTOCOL_ERROR;
goto url_done;
@ -2197,7 +2195,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
/* extensions parts must be empty */
Debug( LDAP_DEBUG_TRACE,
"%s acl_set_gather: host/exts must be absent in URL=\"%s\"\n",
cp->asc_op->o_log_prefix, name->bv_val, 0 );
cp->asc_op->o_log_prefix, name->bv_val );
rc = LDAP_PROTOCOL_ERROR;
goto url_done;
@ -2211,7 +2209,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
"%s acl_set_gather: DN=\"%s\" normalize failed\n",
cp->asc_op->o_log_prefix, ludp->lud_dn, 0 );
cp->asc_op->o_log_prefix, ludp->lud_dn );
goto url_done;
}
@ -2220,7 +2218,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
if ( ( op2.o_bd == NULL ) || ( op2.o_bd->be_search == NULL ) ) {
Debug( LDAP_DEBUG_TRACE,
"%s acl_set_gather: no database could be selected for DN=\"%s\"\n",
cp->asc_op->o_log_prefix, op2.o_req_ndn.bv_val, 0 );
cp->asc_op->o_log_prefix, op2.o_req_ndn.bv_val );
rc = LDAP_NO_SUCH_OBJECT;
goto url_done;
@ -2234,7 +2232,7 @@ acl_set_gather( SetCookie *cookie, struct berval *name, AttributeDescription *de
if ( op2.ors_filter == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"%s acl_set_gather: unable to parse filter=\"%s\"\n",
cp->asc_op->o_log_prefix, op2.ors_filterstr.bv_val, 0 );
cp->asc_op->o_log_prefix, op2.ors_filterstr.bv_val );
rc = LDAP_PROTOCOL_ERROR;
goto url_done;
@ -2633,7 +2631,7 @@ acl_string_expand(
bv->bv_len = size;
Debug( LDAP_DEBUG_ACL, "=> acl_string_expand: pattern: %.*s\n", (int)pat->bv_len, pat->bv_val );
Debug( LDAP_DEBUG_ACL, "=> acl_string_expand: expanded: %s\n", bv->bv_val, 0, 0 );
Debug( LDAP_DEBUG_ACL, "=> acl_string_expand: expanded: %s\n", bv->bv_val );
return 0;
}
@ -2662,7 +2660,7 @@ regex_matches(
if ( acl_string_expand( &bv, pat, dn_matches, val_matches, matches )) {
Debug( LDAP_DEBUG_TRACE,
"expand( \"%s\", \"%s\") failed\n",
pat->bv_val, str, 0 );
pat->bv_val, str );
return( 0 );
}
rc = regcomp( &re, newbuf, REG_EXTENDED|REG_ICASE );
@ -2680,10 +2678,10 @@ regex_matches(
regfree( &re );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: string: %s\n", str, 0, 0 );
"=> regex_matches: string: %s\n", str );
Debug( LDAP_DEBUG_TRACE,
"=> regex_matches: rc: %d %s\n",
rc, !rc ? "matches" : "no matches", 0 );
rc, !rc ? "matches" : "no matches" );
return( !rc );
}

94
servers/slapd/aclparse.c
View file

@ -343,7 +343,7 @@ parse_acl(
if ( a != NULL ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"only one to clause allowed in access line\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
a = (AccessControl *) ch_calloc( 1, sizeof(AccessControl) );
@ -361,7 +361,7 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: dn pattern"
" already specified in to clause.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -386,7 +386,7 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: dn pattern"
" already specified in to clause.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -467,7 +467,7 @@ parse_acl(
"%s: line %d: \"attr\" "
"is deprecated (and undocumented); "
"use \"attrs\" instead.\n",
fname, lineno, 0 );
fname, lineno );
}
a->acl_attrs = str2anlist( a->acl_attrs,
@ -486,14 +486,14 @@ parse_acl(
if ( !BER_BVISEMPTY( &a->acl_attrval ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: attr val already specified in to clause.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( a->acl_attrs == NULL || !BER_BVISEMPTY( &a->acl_attrs[1].an_name ) )
{
Debug( LDAP_DEBUG_ANY,
"%s: line %d: attr val requires a single attribute.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -712,7 +712,7 @@ parse_acl(
if ( a == NULL ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"to clause required before by clause in access line\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -723,7 +723,7 @@ parse_acl(
if ( ++i == argc ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: premature EOL: expecting <who>\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -754,13 +754,13 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: premature eol: "
"expecting closing '}' in \"level{n}\"\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
} else if ( p == style_level ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: empty level "
"in \"level{n}\"\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
p[0] = '\0';
@ -794,7 +794,7 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: unable to parse level "
"in \"level{n}\"\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -813,7 +813,7 @@ parse_acl(
#ifndef LDAP_PF_INET6
Debug( LDAP_DEBUG_ANY,
"%s: line %d: IPv6 not supported\n",
fname, lineno, 0 );
fname, lineno );
#endif /* ! LDAP_PF_INET6 */
sty = ACL_STYLE_IPV6;
@ -823,7 +823,7 @@ parse_acl(
Debug( LDAP_DEBUG_CONFIG | LDAP_DEBUG_ACL,
"%s: line %d: "
"\"path\" style modifier is useless without local.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
#endif /* LDAP_PF_LOCAL */
@ -841,7 +841,7 @@ parse_acl(
case ACL_STYLE_REGEX:
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"\"regex\" style implies \"expand\" modifier.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
break;
@ -955,7 +955,7 @@ parse_acl(
if ( !BER_BVISEMPTY( &bdn->a_pat ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: dn pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -982,7 +982,7 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: rootdn is always granted "
"unlimited privileges.\n",
fname, lineno, 0 );
fname, lineno );
}
} else {
@ -1011,7 +1011,7 @@ parse_acl(
} else {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"\"expand\" used with no expansions in \"pattern\".\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
}
@ -1029,12 +1029,12 @@ parse_acl(
Debug( LDAP_DEBUG_ANY,
"%s: line %d: \"onelevel\" should be used "
"instead of \"level{1}\" in by DN clause\n",
fname, lineno, 0 );
fname, lineno );
} else if ( level == 0 && sty == ACL_STYLE_LEVEL ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: \"base\" should be used "
"instead of \"level{0}\" in by DN clause\n",
fname, lineno, 0 );
fname, lineno );
}
bdn->a_level = level;
@ -1054,7 +1054,7 @@ parse_acl(
if( bdn->a_at != NULL ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: dnattr already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1114,7 +1114,7 @@ parse_acl(
"%s: line %d: "
"deprecated group style \"regex\"; "
"use \"expand\" instead.\n",
fname, lineno, 0 );
fname, lineno );
sty = ACL_STYLE_EXPAND;
break;
@ -1145,7 +1145,7 @@ parse_acl(
if ( !BER_BVISEMPTY( &b->a_group_pat ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: group pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1321,7 +1321,7 @@ parse_acl(
if ( !BER_BVISEMPTY( &b->a_peername_pat ) ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"peername pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1461,7 +1461,7 @@ parse_acl(
if ( !BER_BVISNULL( &b->a_sockname_pat ) ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"sockname pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1494,7 +1494,7 @@ parse_acl(
"%s: line %d: "
"\"expand\" modifier "
"with \"expand\" style.\n",
fname, lineno, 0 );
fname, lineno );
}
sty = ACL_STYLE_BASE;
expand = 1;
@ -1519,7 +1519,7 @@ parse_acl(
if ( !BER_BVISEMPTY( &b->a_domain_pat ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: domain pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1566,7 +1566,7 @@ parse_acl(
if ( !BER_BVISEMPTY( &b->a_sockurl_pat ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: sockurl pattern already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1593,7 +1593,7 @@ parse_acl(
"deprecated set style "
"\"regex\" in <by> clause; "
"use \"expand\" instead.\n",
fname, lineno, 0 );
fname, lineno );
sty = ACL_STYLE_EXPAND;
/* FALLTHRU */
@ -1611,14 +1611,14 @@ parse_acl(
if ( !BER_BVISEMPTY( &b->a_set_pat ) ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: set attribute already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( right == NULL || *right == '\0' ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: no set is defined.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1638,7 +1638,7 @@ parse_acl(
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"undocumented deprecated \"aci\" directive "
"is superseded by \"dynacl/aci\".\n",
fname, lineno, 0 );
fname, lineno );
name = "aci";
} else
@ -1676,14 +1676,14 @@ parse_acl(
if ( b->a_authz.sai_ssf ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: ssf attribute already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( right == NULL || *right == '\0' ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: no ssf is defined.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1714,14 +1714,14 @@ parse_acl(
if ( b->a_authz.sai_transport_ssf ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"transport_ssf attribute already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( right == NULL || *right == '\0' ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: no transport_ssf is defined.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1752,14 +1752,14 @@ parse_acl(
if ( b->a_authz.sai_tls_ssf ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"tls_ssf attribute already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( right == NULL || *right == '\0' ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: no tls_ssf is defined\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1790,14 +1790,14 @@ parse_acl(
if ( b->a_authz.sai_sasl_ssf ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"sasl_ssf attribute already specified.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
if ( right == NULL || *right == '\0' ) {
Debug( LDAP_DEBUG_ANY,
"%s: line %d: no sasl_ssf is defined.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1928,7 +1928,7 @@ parse_acl(
if ( a == NULL ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"warning: no access clause(s) specified in access line.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
} else {
@ -1941,7 +1941,7 @@ parse_acl(
if ( a->acl_access == NULL ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"warning: no by clause(s) specified in access line.\n",
fname, lineno, 0 );
fname, lineno );
goto fail;
}
@ -1949,13 +1949,13 @@ parse_acl(
if ( be->be_nsuffix == NULL ) {
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"scope checking needs suffix before ACLs.\n",
fname, lineno, 0 );
fname, lineno );
/* go ahead, since checking is not authoritative */
} else if ( !BER_BVISNULL( &be->be_nsuffix[ 1 ] ) ) {
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"scope checking only applies to single-valued "
"suffix databases\n",
fname, lineno, 0 );
fname, lineno );
/* go ahead, since checking is not authoritative */
} else {
switch ( check_scope( be, a ) ) {
@ -1963,27 +1963,27 @@ parse_acl(
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"cannot assess the validity of the ACL scope within "
"backend naming context\n",
fname, lineno, 0 );
fname, lineno );
break;
case ACL_SCOPE_WARN:
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"ACL could be out of scope within backend naming context\n",
fname, lineno, 0 );
fname, lineno );
break;
case ACL_SCOPE_PARTIAL:
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"ACL appears to be partially out of scope within "
"backend naming context\n",
fname, lineno, 0 );
fname, lineno );
break;
case ACL_SCOPE_ERR:
Debug( LDAP_DEBUG_ACL, "%s: line %d: warning: "
"ACL appears to be out of scope within "
"backend naming context\n",
fname, lineno, 0 );
fname, lineno );
break;
default:

10
servers/slapd/ad.c
View file

@ -787,7 +787,7 @@ int slap_bv2undef_ad(
Debug( LDAP_DEBUG_ANY,
"%s attributeDescription \"%s\" inserted.\n",
( flags & SLAP_AD_PROXIED ) ? "PROXIED" : "UNKNOWN",
desc->ad_cname.bv_val, 0 );
desc->ad_cname.bv_val );
}
if( !*ad ) {
@ -1145,15 +1145,14 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr )
if ( fp == NULL ) {
Debug( LDAP_DEBUG_ANY,
"get_attrs_from_file: failed to open attribute list file "
"\"%s\": %s\n", fname, strerror(errno), 0 );
"\"%s\": %s\n", fname, strerror(errno) );
return NULL;
}
lcur = line = (char *) ch_malloc( lmax );
if ( !line ) {
Debug( LDAP_DEBUG_ANY,
"get_attrs_from_file: could not allocate memory\n",
0, 0, 0 );
"get_attrs_from_file: could not allocate memory\n" );
fclose(fp);
return NULL;
}
@ -1172,8 +1171,7 @@ file2anlist( AttributeName *an, const char *fname, const char *brkstr )
line = (char *) ch_realloc( line, lmax );
if ( !line ) {
Debug( LDAP_DEBUG_ANY,
"get_attrs_from_file: could not allocate memory\n",
0, 0, 0 );
"get_attrs_from_file: could not allocate memory\n" );
fclose(fp);
return NULL;
}

22
servers/slapd/add.c
View file

@ -51,7 +51,7 @@ do_add( Operation *op, SlapReply *rs )
OpExtraDB *oex;
Debug( LDAP_DEBUG_TRACE, "%s do_add\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
/*
* Parse the add request. It looks like this:
@ -68,13 +68,13 @@ do_add( Operation *op, SlapReply *rs )
/* get the name */
if ( ber_scanf( ber, "{m", /*}*/ &dn ) == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: ber_scanf failed\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
return SLAPD_DISCONNECT;
}
Debug( LDAP_DEBUG_ARGS, "%s do_add: dn (%s)\n",
op->o_log_prefix, dn.bv_val, 0 );
op->o_log_prefix, dn.bv_val );
/* get the attrs */
for ( tag = ber_first_element( ber, &len, &last ); tag != LBER_DEFAULT;
@ -89,7 +89,7 @@ do_add( Operation *op, SlapReply *rs )
if ( rtag == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: decoding error\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
rs->sr_err = SLAPD_DISCONNECT;
goto done;
@ -97,7 +97,7 @@ do_add( Operation *op, SlapReply *rs )
if ( tmp.sml_values == NULL ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: no values for type %s\n",
op->o_log_prefix, tmp.sml_type.bv_val, 0 );
op->o_log_prefix, tmp.sml_type.bv_val );
send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
"no values for attribute type" );
goto done;
@ -118,7 +118,7 @@ do_add( Operation *op, SlapReply *rs )
if ( ber_scanf( ber, /*{*/ "}") == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: ber_scanf failed\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
rs->sr_err = SLAPD_DISCONNECT;
goto done;
@ -126,7 +126,7 @@ do_add( Operation *op, SlapReply *rs )
if ( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: get_ctrls failed\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
goto done;
}
@ -135,7 +135,7 @@ do_add( Operation *op, SlapReply *rs )
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "%s do_add: invalid dn (%s)\n",
op->o_log_prefix, dn.bv_val, 0 );
op->o_log_prefix, dn.bv_val );
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
goto done;
}
@ -144,8 +144,8 @@ do_add( Operation *op, SlapReply *rs )
ber_dupbv( &op->ora_e->e_name, &op->o_req_dn );
ber_dupbv( &op->ora_e->e_nname, &op->o_req_ndn );
Statslog( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
Debug( LDAP_DEBUG_STATS, "%s ADD dn=\"%s\"\n",
op->o_log_prefix, op->o_req_dn.bv_val );
if ( modlist == NULL ) {
send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR,
@ -376,7 +376,7 @@ fe_op_add( Operation *op, SlapReply *rs )
}
}
} else {
Debug( LDAP_DEBUG_ARGS, "do_add: no backend support\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ARGS, "do_add: no backend support\n" );
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"operation not supported within namingContext" );
}

2
servers/slapd/at.c
View file

@ -1101,7 +1101,7 @@ register_at( const char *def, AttributeDescription **rad, int dupok )
}
if ( code ) {
Debug( LDAP_DEBUG_ANY, "register_at: AttributeType \"%s\": %s\n",
def, err, 0 );
def, err );
}
if ( rad ) *rad = ad;
return code;

4
servers/slapd/attr.c
View file

@ -377,7 +377,7 @@ attr_valadd(
(a->a_numvals + nn + 1) * sizeof(struct berval) );
if( v2 == NULL ) {
Debug(LDAP_DEBUG_TRACE,
"attr_valadd: SLAP_REALLOC failed.\n", 0, 0, 0 );
"attr_valadd: SLAP_REALLOC failed.\n" );
return LBER_ERROR_MEMORY;
}
a->a_vals = v2;
@ -386,7 +386,7 @@ attr_valadd(
(a->a_numvals + nn + 1) * sizeof(struct berval) );
if( v2 == NULL ) {
Debug(LDAP_DEBUG_TRACE,
"attr_valadd: SLAP_REALLOC failed.\n", 0, 0, 0 );
"attr_valadd: SLAP_REALLOC failed.\n" );
return LBER_ERROR_MEMORY;
}
a->a_nvals = v2;

8
servers/slapd/ava.c
View file

@ -72,7 +72,7 @@ get_ava(
rtag = ber_scanf( ber, "{mm}", &type, &value );
if( rtag == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n" );
*text = "Error decoding attribute value assertion";
return SLAPD_DISCONNECT;
}
@ -94,7 +94,7 @@ get_ava(
if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_FILTER,
"get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
"get_ava: unknown attributeType %s\n", type.bv_val );
aa->aa_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
f->f_ava = aa;
@ -109,7 +109,7 @@ get_ava(
if( rc != LDAP_SUCCESS ) {
f->f_choice |= SLAPD_FILTER_UNDEFINED;
Debug( LDAP_DEBUG_FILTER,
"get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
"get_ava: illegal value for attributeType %s\n", type.bv_val );
ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
*text = NULL;
rc = LDAP_SUCCESS;
@ -122,7 +122,7 @@ get_ava(
rc = get_aliased_filter_aa ( op, aa, a_alias, text );
if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_FILTER,
"get_ava: Invalid Attribute Aliasing\n", 0, 0, 0 );
"get_ava: Invalid Attribute Aliasing\n" );
return rc;
}
}

8
servers/slapd/back-asyncmeta/add.c
View file

@ -258,7 +258,7 @@ asyncmeta_back_add( Operation *op, SlapReply *rs )
slap_callback *cb = op->o_callback;
Debug(LDAP_DEBUG_ARGS, "==> asyncmeta_back_add: %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
asyncmeta_new_bm_context(op, rs, &bc, mi->mi_ntargets );
if (bc == NULL) {
@ -299,7 +299,7 @@ asyncmeta_back_add( Operation *op, SlapReply *rs )
case META_SEARCH_CANDIDATE:
/* target is already bound, just send the request */
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_add: "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
rc = asyncmeta_back_add_start( op, rs, mc, bc, candidate);
if (rc == META_SEARCH_ERR) {
@ -314,7 +314,7 @@ asyncmeta_back_add( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_add: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
asyncmeta_drop_bc(mc, bc);
@ -347,7 +347,7 @@ asyncmeta_back_add( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_add: ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
candidates[ candidate ].sr_type = REP_RESULT;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);

14
servers/slapd/back-asyncmeta/bind.c
View file

@ -70,7 +70,7 @@ asyncmeta_back_bind( Operation *op, SlapReply *rs )
rs->sr_err = LDAP_SUCCESS;
Debug( LDAP_DEBUG_ARGS, "%s asyncmeta_back_bind: dn=\"%s\".\n",
op->o_log_prefix, op->o_req_dn.bv_val, 0 );
op->o_log_prefix, op->o_req_dn.bv_val );
/* the test on the bind method should be superfluous */
switch ( be_rootdn_bind( op, rs ) ) {
@ -107,7 +107,7 @@ asyncmeta_back_bind( Operation *op, SlapReply *rs )
rs->sr_text ? rs->sr_text : "" );
Debug( LDAP_DEBUG_ANY,
"%s %s\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
/* FIXME: there might be cases where we don't want
@ -152,7 +152,7 @@ asyncmeta_back_bind( Operation *op, SlapReply *rs )
Debug( LDAP_DEBUG_ANY,
"### %s asyncmeta_back_bind: more than one"
" candidate selected...\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
}
if ( isroot ) {
@ -262,7 +262,7 @@ asyncmeta_bind_op_result(
Debug( LDAP_DEBUG_TRACE,
">>> %s asyncmeta_bind_op_result[%d]\n",
op->o_log_prefix, candidate, 0 );
op->o_log_prefix, candidate );
/* make sure this is clean */
assert( rs->sr_ctrls == NULL );
@ -983,7 +983,7 @@ retry:;
( xtext ? xtext : "" ),
( xmatched ? xmatched : "" ) );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
/*
@ -1693,7 +1693,7 @@ asyncmeta_dobind_init(Operation *op, SlapReply *rs, bm_context_t *bc, a_metaconn
meta_search_candidate_t retcode;
Debug( LDAP_DEBUG_TRACE, "%s >>> asyncmeta_search_dobind_init[%d]\n",
op->o_log_prefix, candidate, 0 );
op->o_log_prefix, candidate );
if ( mc->mc_authz_target == META_BOUND_ALL ) {
return META_SEARCH_CANDIDATE;
@ -1864,7 +1864,7 @@ retry_bind:
snprintf( buf, sizeof( buf ), "asyncmeta_search_dobind_init[%d] mc=%p ld=%p rc=%d",
candidate, (void *)mc, (void *)mc->mc_conns[ candidate ].msc_ld, rc );
Debug( LDAP_DEBUG_ANY, "### %s %s\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
#endif /* DEBUG_205 */

2
servers/slapd/back-asyncmeta/candidates.c
View file

@ -263,7 +263,7 @@ asyncmeta_clear_one_msc(
snprintf( buf, sizeof( buf ), "asyncmeta_clear_one_msc ldap_unbind_ext[%d] ld=%p",
candidate, (void *)msc->msc_ld );
Debug( LDAP_DEBUG_ANY, "### %s %s\n",
op ? op->o_log_prefix : "", buf, 0 );
op ? op->o_log_prefix : "", buf );
#endif /* DEBUG_205 */
ldap_unbind_ext( msc->msc_ld, NULL, NULL );

8
servers/slapd/back-asyncmeta/compare.c
View file

@ -182,7 +182,7 @@ asyncmeta_back_compare( Operation *op, SlapReply *rs )
slap_callback *cb = op->o_callback;
Debug(LDAP_DEBUG_ARGS, "==> asyncmeta_back_compare: %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
asyncmeta_new_bm_context(op, rs, &bc, mi->mi_ntargets );
if (bc == NULL) {
@ -223,7 +223,7 @@ asyncmeta_back_compare( Operation *op, SlapReply *rs )
case META_SEARCH_CANDIDATE:
/* target is already bound, just send the request */
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_compare: "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
rc = asyncmeta_back_compare_start( op, rs, mc, bc, candidate);
if (rc == META_SEARCH_ERR) {
@ -238,7 +238,7 @@ asyncmeta_back_compare( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_compare: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
asyncmeta_drop_bc(mc, bc);
@ -271,7 +271,7 @@ asyncmeta_back_compare( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_compare: ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
candidates[ candidate ].sr_type = REP_RESULT;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);

104
servers/slapd/back-asyncmeta/config.c
View file

@ -640,7 +640,7 @@ asyncmeta_suffixm_config(
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"suffix \"%s\" is invalid",
argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -654,7 +654,7 @@ asyncmeta_suffixm_config(
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"suffix \"%s\" must be within the database naming context",
argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
free( pvnc.bv_val );
free( nvnc.bv_val );
return 1;
@ -665,7 +665,7 @@ asyncmeta_suffixm_config(
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"massaged suffix \"%s\" is invalid",
argv[2] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
free( pvnc.bv_val );
free( nvnc.bv_val );
return 1;
@ -676,7 +676,7 @@ asyncmeta_suffixm_config(
Debug( LDAP_DEBUG_ANY,
"%s: warning: <massaged suffix> \"%s\" resolves to this database, in "
"\"suffixMassage <suffix> <massaged suffix>\"\n",
c->log, prnc.bv_val, 0 );
c->log, prnc.bv_val );
}
/*
@ -1923,7 +1923,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
if ( !mi->mi_ntargets ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need \"uri\" directive first" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -1959,7 +1959,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
if ( c->be->be_nsuffix == NULL ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"the suffix must be defined before any target" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -1972,7 +1972,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
"out of memory while storing server name"
" in \"%s <protocol>://<server>[:port]/<naming context>\"",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -1981,7 +1981,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
"unable to init server"
" in \"%s <protocol>://<server>[:port]/<naming context>\"",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2004,7 +2004,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
"unable to parse URIs #%d"
" in \"%s <protocol>://<server>[:port]/<naming context>\"",
j-1, c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2031,7 +2031,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
"unable to parse URI #%d"
" in \"%s <protocol>://<server>[:port]/<naming context>\"",
j-1, c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_charray_free( uris );
return 1;
}
@ -2046,7 +2046,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
"missing <naming context> "
" in \"%s <protocol>://<server>[:port]/<naming context>\"",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_free_urllist( ludp );
ldap_charray_free( uris );
return 1;
@ -2062,7 +2062,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"target DN is invalid \"%s\"",
c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_free_urllist( ludp );
ldap_charray_free( uris );
return( 1 );
@ -2084,7 +2084,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"invalid scope for target \"%s\"",
c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_free_urllist( ludp );
ldap_charray_free( uris );
return( 1 );
@ -2095,7 +2095,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
if ( ludp->lud_dn != NULL && ludp->lud_dn[ 0 ] != '\0' ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"multiple URIs must have no DN part" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_free_urllist( ludp );
ldap_charray_free( uris );
return( 1 );
@ -2107,7 +2107,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
ldap_free_urllist( ludp );
if ( tmpuri == NULL ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "no memory?" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
ldap_charray_free( uris );
return( 1 );
}
@ -2119,7 +2119,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
ldap_charray_free( uris );
if ( mt->mt_uri == NULL) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "no memory?" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return( 1 );
}
@ -2135,7 +2135,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
if ( BER_BVISNULL( &c->be->be_nsuffix[ j ] ) ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"<naming context> of URI must be within the naming context of this database." );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
c->ca_private = mt;
@ -2145,7 +2145,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
case LDAP_BACK_CFG_SUBTREE_IN:
/* subtree-exclude */
if ( asyncmeta_subtree_config( mt, c )) {
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
break;
@ -2208,7 +2208,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s\" alone must be inside a \"uri\" directive",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mi->mi_defaulttarget = i;
@ -2219,7 +2219,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s none\" should go before uri definitions",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
}
mi->mi_defaulttarget = META_DEFAULT_TARGET_NONE;
@ -2232,7 +2232,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"illegal target number %d",
mi->mi_defaulttarget );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -2254,7 +2254,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse dncache ttl \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mi->mi_cache.ttl = (time_t)t;
@ -2269,7 +2269,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse network timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mc->mc_network_timeout = (time_t)t;
@ -2283,7 +2283,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse idle timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2302,7 +2302,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: "
"\"binddn\" statement is deprecated; "
"use \"acl-authcDN\" instead\n",
c->log, 0, 0 );
c->log );
/* FIXME: some day we'll need to throw an error */
}
@ -2318,7 +2318,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s "
"\"bindpw\" statement is deprecated; "
"use \"acl-passwd\" instead\n",
c->log, 0, 0 );
c->log );
/* FIXME: some day we'll need to throw an error */
}
@ -2348,7 +2348,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mc->mc_flags &= ~LDAP_BACK_F_TLS_MASK;
@ -2358,7 +2358,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
if ( c->op == SLAP_CONFIG_ADD && mi->mi_ntargets == 0 ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need \"uri\" directive first" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2376,7 +2376,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mc->mc_flags &= ~LDAP_BACK_F_T_F_MASK2;
@ -2390,7 +2390,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mi->mi_flags &= ~META_BACK_F_ONERR_MASK;
@ -2412,7 +2412,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s\" must appear before target definitions",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return( 1 );
}
@ -2427,7 +2427,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
c->argv[ 1 ],
LDAP_BACK_CONN_PRIV_MIN,
LDAP_BACK_CONN_PRIV_MAX );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mi->mi_conn_priv_max = c->value_int;
@ -2439,7 +2439,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mc->mc_flags &= ~LDAP_BACK_F_CANCEL_MASK2;
@ -2456,7 +2456,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2471,7 +2471,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -2493,7 +2493,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
{
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"quarantine already defined" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2506,7 +2506,7 @@ asyncmeta_back_cf_gen( ConfigArgs *c )
}
if ( mi->mi_ldap_extra->retry_info_parse( c->argv[ 1 ], &mc->mc_quarantine, c->cr_msg, sizeof( c->cr_msg ) ) ) {
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2758,7 +2758,7 @@ map_fail:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse nretries {never|forever|<retries>}: \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -2771,7 +2771,7 @@ map_fail:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unsupported protocol version \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
mc->mc_version = c->value_int;
@ -2807,7 +2807,7 @@ map_fail:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"unable to parse client-pr {accept-unsolicited|disable|<size>}: \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return( 1 );
}
break;
@ -2851,7 +2851,7 @@ asyncmeta_back_init_cf( BackendInfo *bi )
Debug( LDAP_DEBUG_ANY, "config_back_initialize: "
"warning, unable to get \"olcDbACLPasswd\" "
"attribute description: %d: %s\n",
rc, text, 0 );
rc, text );
} else {
(void)ldif_must_b64_encode_register( ad->ad_cname.bv_val,
ad->ad_type->sat_oid );
@ -2863,7 +2863,7 @@ asyncmeta_back_init_cf( BackendInfo *bi )
Debug( LDAP_DEBUG_ANY, "config_back_initialize: "
"warning, unable to get \"olcDbIDAssertPasswd\" "
"attribute description: %d: %s\n",
rc, text, 0 );
rc, text );
} else {
(void)ldif_must_b64_encode_register( ad->ad_cname.bv_val,
ad->ad_type->sat_oid );
@ -2894,7 +2894,7 @@ asyncmeta_map_config(
snprintf( c->cr_msg, sizeof(c->cr_msg),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2925,7 +2925,7 @@ asyncmeta_map_config(
{
snprintf( c->cr_msg, sizeof(c->cr_msg),
"objectclass attribute cannot be mapped" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2934,7 +2934,7 @@ asyncmeta_map_config(
if ( mapping == NULL ) {
snprintf( c->cr_msg, sizeof(c->cr_msg),
"out of memory" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
ber_str2bv( src, 0, 1, &mapping[ 0 ].src );
@ -2950,7 +2950,7 @@ asyncmeta_map_config(
if ( oc_bvfind( &mapping[ 0 ].src ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"%s: warning, source objectClass '%s' should be defined in schema\n",
c->log, src, 0 );
c->log, src );
/*
* FIXME: this should become an err
@ -2962,7 +2962,7 @@ asyncmeta_map_config(
if ( oc_bvfind( &mapping[ 0 ].dst ) == NULL ) {
Debug( LDAP_DEBUG_ANY,
"%s: warning, destination objectClass '%s' is not defined in schema\n",
c->log, dst, 0 );
c->log, dst );
}
} else {
int rc;
@ -2974,7 +2974,7 @@ asyncmeta_map_config(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"%s: warning, source attributeType '%s' should be defined in schema\n",
c->log, src, 0 );
c->log, src );
/*
* FIXME: this should become an err
@ -2990,7 +2990,7 @@ asyncmeta_map_config(
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"source attributeType \"%s\": %d (%s)",
src, rc, text ? text : "" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
goto error_return;
}
}
@ -3002,7 +3002,7 @@ asyncmeta_map_config(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"%s: warning, destination attributeType '%s' is not defined in schema\n",
c->log, dst, 0 );
c->log, dst );
/*
* we create a fake "proxied" ad
@ -3015,7 +3015,7 @@ asyncmeta_map_config(
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"destination attributeType \"%s\": %d (%s)\n",
dst, rc, text ? text : "" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -3026,7 +3026,7 @@ asyncmeta_map_config(
{
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"duplicate mapping found." );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
goto error_return;
}

12
servers/slapd/back-asyncmeta/conn.c
View file

@ -157,7 +157,7 @@ asyncmeta_init_one_conn(
"retry block #%d try #%d",
candidate, ri->ri_idx, ri->ri_count );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
mt->mt_isquarantined = LDAP_BACK_FQ_RETRYING;
@ -997,7 +997,7 @@ asyncmeta_getconn(
Debug( LDAP_DEBUG_TRACE,
"==>asyncmeta__getconn: got target=%d for ndn=\"%s\" from cache\n",
i, op->o_req_ndn.bv_val, 0 );
i, op->o_req_ndn.bv_val );
if ( LDAP_BACK_CONN_ISPRIV( &mc_curr ) ) {
LDAP_BACK_CONN_ISPRIV_SET( mc );
@ -1076,7 +1076,7 @@ asyncmeta_getconn(
ncandidates++;
Debug( LDAP_DEBUG_TRACE, "%s: asyncmeta_getconn[%d]\n",
op->o_log_prefix, i, 0 );
op->o_log_prefix, i );
} else if ( lerr == LDAP_UNAVAILABLE && !META_BACK_ONERR_STOP( mi ) ) {
META_CANDIDATE_SET( &candidates[ i ] );
@ -1226,7 +1226,7 @@ asyncmeta_quarantine(
Debug( LDAP_DEBUG_ANY,
"%s asyncmeta_quarantine[%d]: enter.\n",
op->o_log_prefix, candidate, 0 );
op->o_log_prefix, candidate );
ri->ri_idx = 0;
ri->ri_count = 0;
@ -1240,7 +1240,7 @@ asyncmeta_quarantine(
"asyncmeta_quarantine[%d]: block #%d try #%d failed",
candidate, ri->ri_idx, ri->ri_count );
Debug( LDAP_DEBUG_ANY, "%s %s.\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
++ri->ri_count;
@ -1262,7 +1262,7 @@ asyncmeta_quarantine(
} else if ( mt->mt_isquarantined == LDAP_BACK_FQ_RETRYING ) {
Debug( LDAP_DEBUG_ANY,
"%s asyncmeta_quarantine[%d]: exit.\n",
op->o_log_prefix, candidate, 0 );
op->o_log_prefix, candidate );
if ( mi->mi_quarantine_f ) {
(void)mi->mi_quarantine_f( mi, candidate,

8
servers/slapd/back-asyncmeta/delete.c
View file

@ -130,7 +130,7 @@ asyncmeta_back_delete( Operation *op, SlapReply *rs )
slap_callback *cb = op->o_callback;
Debug(LDAP_DEBUG_ARGS, "==> asyncmeta_back_delete: %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
asyncmeta_new_bm_context(op, rs, &bc, mi->mi_ntargets );
if (bc == NULL) {
@ -171,7 +171,7 @@ asyncmeta_back_delete( Operation *op, SlapReply *rs )
case META_SEARCH_CANDIDATE:
/* target is already bound, just send the request */
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_delete: "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
rc = asyncmeta_back_delete_start( op, rs, mc, bc, candidate);
if (rc == META_SEARCH_ERR) {
@ -186,7 +186,7 @@ asyncmeta_back_delete( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_delete: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
asyncmeta_drop_bc(mc, bc);
@ -219,7 +219,7 @@ asyncmeta_back_delete( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_delete: ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
candidates[ candidate ].sr_type = REP_RESULT;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);

8
servers/slapd/back-asyncmeta/init.c
View file

@ -106,8 +106,7 @@ asyncmeta_back_db_init(
bi = backend_info( "ldap" );
if ( !bi || !bi->bi_extra ) {
Debug( LDAP_DEBUG_ANY,
"asyncmeta_back_db_init: needs back-ldap\n",
0, 0, 0 );
"asyncmeta_back_db_init: needs back-ldap\n" );
return 1;
}
@ -206,7 +205,7 @@ asyncmeta_target_finish(
"(likely authz=\"*\" used with \"non-prescriptive\" flag)",
log );
Debug( LDAP_DEBUG_ANY, "%s (target %s)\n",
msg, mt->mt_uri, 0 );
msg, mt->mt_uri );
return 1;
}
@ -257,8 +256,7 @@ asyncmeta_back_db_open(
return 0;
Debug( LDAP_DEBUG_ANY,
"asyncmeta_back_db_open: no targets defined\n",
0, 0, 0 );
"asyncmeta_back_db_open: no targets defined\n" );
return 1;
}
mi->mi_num_conns = 0;

3
servers/slapd/back-asyncmeta/message_queue.c
View file

@ -365,8 +365,7 @@ void asyncmeta_free_op(Operation *op)
case LDAP_REQ_DELETE:
break;
default:
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_free_op : other message type",
0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "==> asyncmeta_free_op : other message type" );
}
if (op->o_ctrls != NULL) {

28
servers/slapd/back-asyncmeta/meta_result.c
View file

@ -181,7 +181,7 @@ asyncmeta_send_entry(
Debug( LDAP_DEBUG_ANY,
"%s asyncmeta_send_entry(\"%s\"): "
"invalid DN syntax\n",
op->o_log_prefix, ent.e_name.bv_val, 0 );
op->o_log_prefix, ent.e_name.bv_val );
rc = LDAP_INVALID_DN_SYNTAX;
goto done;
}
@ -240,7 +240,7 @@ asyncmeta_send_entry(
op->o_log_prefix, ent.e_name.bv_val,
mapped.bv_val, text );
Debug( LDAP_DEBUG_ANY, "%s", buf, 0, 0 );
Debug( LDAP_DEBUG_ANY, "%s", buf );
( void )ber_scanf( &ber, "x" /* [W] */ );
op->o_tmpfree( attr, op->o_tmpmemctx );
continue;
@ -517,7 +517,7 @@ next_attr:;
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_send_entry(\"%s\"): "
".\n",
op->o_log_prefix, ent.e_name.bv_val, 0);
op->o_log_prefix, ent.e_name.bv_val );
ldap_get_entry_controls( mc->mc_conns[target].msc_ldr,
e, &rs->sr_ctrls );
rs->sr_entry = &ent;
@ -654,7 +654,7 @@ asyncmeta_search_last_result(a_metaconn_t *mc, bm_context_t *bc, int candidate,
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_search_last_result(\"%s\"): "
".\n",
op->o_log_prefix, 0, 0);
op->o_log_prefix, 0 );
rs->sr_err = sres;
rs->sr_matched = ( sres == LDAP_SUCCESS ? NULL : matched );
rs->sr_ref = ( sres == LDAP_REFERRAL ? rs->sr_v2ref : NULL );
@ -775,7 +775,7 @@ asyncmeta_handle_bind_result(LDAPMessage *msg, a_metaconn_t *mc, bm_context_t *b
candidates = bc->candidates;
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_handle_bind_result[%d]\n",
op->o_log_prefix, candidate, 0);
op->o_log_prefix, candidate );
retcode = asyncmeta_dobind_result( op, rs, mc, candidate, candidates, msg );
if ( retcode == META_SEARCH_CANDIDATE ) {
switch (op->o_tag) {
@ -865,7 +865,7 @@ asyncmeta_handle_search_msg(LDAPMessage *res, a_metaconn_t *mc, bm_context_t *bc
case LDAP_RES_SEARCH_ENTRY:
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_handle_search_msg: msc %p entry\n",
op.o_log_prefix, msc, 0);
op.o_log_prefix, msc );
if ( candidates[ i ].sr_type == REP_INTERMEDIATE ) {
/* don't retry any more... */
candidates[ i ].sr_type = REP_RESULT;
@ -991,7 +991,7 @@ asyncmeta_handle_search_msg(LDAPMessage *res, a_metaconn_t *mc, bm_context_t *bc
case LDAP_RES_SEARCH_RESULT:
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_handle_search_msg: msc %p result\n",
op.o_log_prefix, msc, 0);
op.o_log_prefix, msc );
candidates[ i ].sr_type = REP_RESULT;
candidates[ i ].sr_msgid = META_MSGID_IGNORE;
/* NOTE: ignores response controls
@ -1114,11 +1114,11 @@ asyncmeta_handle_search_msg(LDAPMessage *res, a_metaconn_t *mc, bm_context_t *bc
candidates[ i ].sr_matched ? candidates[ i ].sr_matched : "",
(long) candidates[ i ].sr_err );
if ( candidates[ i ].sr_err == LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s.\n", buf, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "%s.\n", buf );
} else {
Debug( LDAP_DEBUG_ANY, "%s (%s).\n",
buf, ldap_err2string( candidates[ i ].sr_err ), 0 );
buf, ldap_err2string( candidates[ i ].sr_err ) );
}
}
@ -1262,7 +1262,7 @@ got_err:
if (asyncmeta_is_last_result(mc, bc, i) == 0) {
Debug( LDAP_DEBUG_TRACE,
"%s asyncmeta_handle_search_msg: msc %p last result\n",
op.o_log_prefix, msc, 0);
op.o_log_prefix, msc );
asyncmeta_search_last_result(mc, bc, i, sres);
err_cleanup:
rc = rs->sr_err;
@ -1473,7 +1473,7 @@ asyncmeta_op_read_error(a_metaconn_t *mc, int candidate, int error)
/* no outstanding ops, nothing to do but log */
Debug( LDAP_DEBUG_ANY,
"asyncmeta_op_read_error: %x\n",
error,0,0 );
error );
#if 0
if (mc->mc_conns[candidate].conn) {
Connection *conn = mc->mc_conns[candidate].conn;
@ -1584,7 +1584,7 @@ again:
continue;
}
Debug(LDAP_DEBUG_TRACE, "asyncmeta_op_handle_result: got msgid %d on msc %p\n",
ldap_msgid(msg), msc, 0);
ldap_msgid(msg), msc );
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex );
bc = asyncmeta_find_message(ldap_msgid(msg), mc, i);
@ -1593,7 +1593,7 @@ again:
ldap_pvt_thread_mutex_unlock( &mc->mc_om_mutex );
if (!bc) {
Debug( LDAP_DEBUG_ANY,
"asyncmeta_op_handle_result: Unable to find bc for msguid %d\n", ldap_msgid(msg), 0, 0 );
"asyncmeta_op_handle_result: Unable to find bc for msguid %d\n", ldap_msgid(msg) );
ldap_msgfree(msg);
continue;
}
@ -1651,7 +1651,7 @@ again:
Debug( LDAP_DEBUG_ANY,
"asyncmeta_op_handle_result: "
"unrecognized response message tag=%d\n",
rc,0,0 );
rc );
}
}

8
servers/slapd/back-asyncmeta/modify.c
View file

@ -259,7 +259,7 @@ asyncmeta_back_modify( Operation *op, SlapReply *rs )
slap_callback *cb = op->o_callback;
Debug(LDAP_DEBUG_ARGS, "==> asyncmeta_back_modify: %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
asyncmeta_new_bm_context(op, rs, &bc, mi->mi_ntargets );
if (bc == NULL) {
@ -300,7 +300,7 @@ asyncmeta_back_modify( Operation *op, SlapReply *rs )
case META_SEARCH_CANDIDATE:
/* target is already bound, just send the request */
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modify: "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
rc = asyncmeta_back_modify_start( op, rs, mc, bc, candidate);
if (rc == META_SEARCH_ERR) {
@ -315,7 +315,7 @@ asyncmeta_back_modify( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modify: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
asyncmeta_drop_bc(mc, bc);
@ -348,7 +348,7 @@ asyncmeta_back_modify( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modify: ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
candidates[ candidate ].sr_type = REP_RESULT;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);

8
servers/slapd/back-asyncmeta/modrdn.c
View file

@ -205,7 +205,7 @@ asyncmeta_back_modrdn( Operation *op, SlapReply *rs )
slap_callback *cb = op->o_callback;
Debug(LDAP_DEBUG_ARGS, "==> asyncmeta_back_modrdn: %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
asyncmeta_new_bm_context(op, rs, &bc, mi->mi_ntargets );
if (bc == NULL) {
@ -246,7 +246,7 @@ asyncmeta_back_modrdn( Operation *op, SlapReply *rs )
case META_SEARCH_CANDIDATE:
/* target is already bound, just send the request */
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modrdn: "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
rc = asyncmeta_back_modrdn_start( op, rs, mc, bc, candidate);
if (rc == META_SEARCH_ERR) {
@ -261,7 +261,7 @@ asyncmeta_back_modrdn( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modrdn: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);
asyncmeta_drop_bc(mc, bc);
@ -294,7 +294,7 @@ asyncmeta_back_modrdn( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_modrdn: ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, candidate );
candidates[ candidate ].sr_msgid = META_MSGID_IGNORE;
candidates[ candidate ].sr_type = REP_RESULT;
ldap_pvt_thread_mutex_lock( &mc->mc_om_mutex);

8
servers/slapd/back-asyncmeta/search.c
View file

@ -116,7 +116,7 @@ asyncmeta_back_search_start(
return META_SEARCH_NOT_CANDIDATE;
}
Debug( LDAP_DEBUG_TRACE, "%s >>> asyncmeta_back_search_start[%d]\n", op->o_log_prefix, candidate, 0 );
Debug( LDAP_DEBUG_TRACE, "%s >>> asyncmeta_back_search_start[%d]\n", op->o_log_prefix, candidate );
/*
* modifies the base according to the scope, if required
*/
@ -550,7 +550,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
/* target is already bound, just send the search request */
ncandidates++;
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_search: IS_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, i , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, i );
rc = asyncmeta_back_search_start( op, rs, mc, bc, i, NULL, 0 );
if (rc == META_SEARCH_ERR) {
@ -567,7 +567,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
break;
case META_SEARCH_NOT_CANDIDATE:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_search: NOT_CANDIDATE "
"cnd=\"%ld\"\n", op->o_log_prefix, i , 0);
"cnd=\"%ld\"\n", op->o_log_prefix, i );
candidates[ i ].sr_msgid = META_MSGID_IGNORE;
break;
@ -599,7 +599,7 @@ asyncmeta_back_search( Operation *op, SlapReply *rs )
case META_SEARCH_ERR:
Debug( LDAP_DEBUG_TRACE, "%s asyncmeta_back_search: SEARCH_ERR "
"cnd=\"%ldd\"\n", op->o_log_prefix, i , 0);
"cnd=\"%ldd\"\n", op->o_log_prefix, i );
candidates[ i ].sr_msgid = META_MSGID_IGNORE;
candidates[ i ].sr_type = REP_RESULT;

2
servers/slapd/back-asyncmeta/unbind.c
View file

@ -43,7 +43,7 @@ asyncmeta_back_conn_destroy(
Debug( LDAP_DEBUG_TRACE,
"=>asyncmeta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
conn->c_connid,
BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val );
/*
* Cleanup rewrite session
*/

46
servers/slapd/back-bdb/add.c
View file

@ -46,7 +46,7 @@ bdb_add(Operation *op, SlapReply *rs )
int num_ctrls = 0;
Debug(LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_add) ": %s\n",
op->ora_e->e_name.bv_val, 0, 0);
op->ora_e->e_name.bv_val );
#ifdef LDAP_X_TXN
if( op->o_txnSpec && txn_preop( op, rs ))
@ -61,7 +61,7 @@ bdb_add(Operation *op, SlapReply *rs )
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": entry failed schema check: "
"%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
"%s (%d)\n", rs->sr_text, rs->sr_err );
goto return_results;
}
@ -71,7 +71,7 @@ bdb_add(Operation *op, SlapReply *rs )
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": entry failed op attrs add: "
"%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
"%s (%d)\n", rs->sr_text, rs->sr_err );
goto return_results;
}
@ -121,13 +121,13 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": txn_begin failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 );
ltid->id(ltid) );
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
@ -180,7 +180,7 @@ retry: /* transaction retry */
p = NULL;
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": parent "
"does not exist\n", 0, 0, 0 );
"does not exist\n" );
rs->sr_err = LDAP_REFERRAL;
rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
@ -202,8 +202,7 @@ retry: /* transaction retry */
p = NULL;
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": no write access to parent\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": no write access to parent\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to parent";
goto return_results;;
@ -215,8 +214,7 @@ retry: /* transaction retry */
p = NULL;
/* parent is a subentry, don't allow add */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": parent is subentry\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": parent is subentry\n" );
rs->sr_err = LDAP_OBJECT_CLASS_VIOLATION;
rs->sr_text = "parent is a subentry";
goto return_results;;
@ -227,8 +225,7 @@ retry: /* transaction retry */
p = NULL;
/* parent is an alias, don't allow add */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": parent is alias\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": parent is alias\n" );
rs->sr_err = LDAP_ALIAS_PROBLEM;
rs->sr_text = "parent is an alias";
goto return_results;;
@ -242,8 +239,7 @@ retry: /* transaction retry */
bdb_unlocked_cache_return_entry_r( bdb, p );
p = NULL;
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": parent is referral\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": parent is referral\n" );
rs->sr_err = LDAP_REFERRAL;
rs->sr_flags = REP_MATCHED_MUSTBEFREED | REP_REF_MUSTBEFREED;
@ -295,8 +291,7 @@ retry: /* transaction retry */
}
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": no write access to entry\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": no write access to entry\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to entry";
goto return_results;;
@ -313,8 +308,7 @@ retry: /* transaction retry */
}
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": no write access to attribute\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": no write access to attribute\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to attribute";
goto return_results;;
@ -325,7 +319,7 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": next_id failed (%d)\n",
rs->sr_err, 0, 0 );
rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
@ -340,20 +334,20 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": txn_begin(2) failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_add) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 );
lt2->id(lt2) );
/* dn2id index */
rs->sr_err = bdb_dn2id_add( op, lt2, ei, op->ora_e );
if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": dn2id_add failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
@ -372,8 +366,7 @@ retry: /* transaction retry */
rs->sr_err = bdb_index_entry_add( op, lt2, op->ora_e );
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": index_entry_add failed\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": index_entry_add failed\n" );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -389,8 +382,7 @@ retry: /* transaction retry */
rs->sr_err = bdb_id2entry_add( op->o_bd, lt2, op->ora_e );
if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_add) ": id2entry_add failed\n",
0, 0, 0 );
LDAP_XSTRING(bdb_add) ": id2entry_add failed\n" );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -419,7 +411,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_add) ": post-read "
"failed!\n", 0, 0, 0 );
"failed!\n" );
if ( op->o_postread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */

2
servers/slapd/back-bdb/attr.c
View file

@ -276,7 +276,7 @@ fail:
}
Debug( LDAP_DEBUG_CONFIG, "index %s 0x%04lx\n",
ad->ad_cname.bv_val, mask, 0 );
ad->ad_cname.bv_val, mask );
a = (AttrInfo *) ch_malloc( sizeof(AttrInfo) );

10
servers/slapd/back-bdb/bind.c
View file

@ -37,7 +37,7 @@ bdb_bind( Operation *op, SlapReply *rs )
Debug( LDAP_DEBUG_ARGS,
"==> " LDAP_XSTRING(bdb_bind) ": dn: %s\n",
op->o_req_dn.bv_val, 0, 0);
op->o_req_dn.bv_val );
/* allow noauth binds */
switch ( be_rootdn_bind( op, NULL ) ) {
@ -103,22 +103,20 @@ dn2entry_retry:
/* check for deleted */
if ( is_entry_subentry( e ) ) {
/* entry is an subentry, don't allow bind */
Debug( LDAP_DEBUG_TRACE, "entry is subentry\n", 0,
0, 0 );
Debug( LDAP_DEBUG_TRACE, "entry is subentry\n" );
rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}
if ( is_entry_alias( e ) ) {
/* entry is an alias, don't allow bind */
Debug( LDAP_DEBUG_TRACE, "entry is alias\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "entry is alias\n" );
rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}
if ( is_entry_referral( e ) ) {
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
0, 0 );
Debug( LDAP_DEBUG_TRACE, "entry is referral\n" );
rs->sr_err = LDAP_INVALID_CREDENTIALS;
goto done;
}

6
servers/slapd/back-bdb/cache.c
View file

@ -1407,7 +1407,7 @@ bdb_cache_delete(
}
Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_delete( %ld )\n",
e->e_id, 0, 0 );
e->e_id );
/* set lru mutex */
ldap_pvt_thread_mutex_lock( &bdb->bi_cache.c_lru_mutex );
@ -1529,7 +1529,7 @@ bdb_cache_release_all( Cache *cache )
/* set lru mutex */
ldap_pvt_thread_mutex_lock( &cache->c_lru_mutex );
Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_release_all\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "====> bdb_cache_release_all\n" );
avl_free( cache->c_dntree.bei_kids, NULL );
avl_free( cache->c_idtree, bdb_entryinfo_release );
@ -1681,7 +1681,7 @@ bdb_reader_get( Operation *op, DB_ENV *env, DB_TXN **txn )
data, bdb_reader_free, NULL, NULL ) ) ) {
TXN_ABORT( *txn );
Debug( LDAP_DEBUG_ANY, "bdb_reader_get: err %s(%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
return rc;
}

2
servers/slapd/back-bdb/compare.c
View file

@ -111,7 +111,7 @@ dn2entry_retry:
rs->sr_matched = e->e_name.bv_val;
}
Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "entry is referral\n" );
send_ldap_result( op, rs );

8
servers/slapd/back-bdb/config.c
View file

@ -258,7 +258,7 @@ bdb_online_index( void *ctx, void *arg )
if ( rc )
break;
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_online_index) ": txn id: %x\n",
txn->id(txn), 0, 0 );
txn->id(txn) );
if ( getnext ) {
getnext = 0;
BDB_ID2DISK( id, &nid );
@ -379,7 +379,7 @@ bdb_cf_cleanup( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"failed to reopen database, rc=%d", rc );
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_cf_cleanup)
": %s\n", c->cr_msg, 0, 0 );
": %s\n", c->cr_msg );
rc = LDAP_OTHER;
}
}
@ -841,7 +841,7 @@ bdb_cf_gen( ConfigArgs *c )
if ( !f ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ), "%s: invalid path: %s",
c->log, strerror( errno ));
Debug( LDAP_DEBUG_ANY, "%s\n", c->cr_msg, 0, 0 );
Debug( LDAP_DEBUG_ANY, "%s\n", c->cr_msg );
return -1;
}
@ -937,7 +937,7 @@ bdb_cf_gen( ConfigArgs *c )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s: size must be > 0 and <= 64: %d",
c->log, s );
Debug( LDAP_DEBUG_ANY, "%s\n", c->cr_msg, 0, 0 );
Debug( LDAP_DEBUG_ANY, "%s\n", c->cr_msg );
return -1;
}
i = strlen(c->argv[1]);

43
servers/slapd/back-bdb/delete.c
View file

@ -52,7 +52,7 @@ bdb_delete( Operation *op, SlapReply *rs )
int parent_is_leaf = 0;
Debug( LDAP_DEBUG_ARGS, "==> " LDAP_XSTRING(bdb_delete) ": %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
#ifdef LDAP_X_TXN
if( op->o_txnSpec && txn_preop( op, rs ))
@ -82,8 +82,7 @@ retry: /* transaction retry */
p = NULL;
}
Debug( LDAP_DEBUG_TRACE,
"==> " LDAP_XSTRING(bdb_delete) ": retrying...\n",
0, 0, 0 );
"==> " LDAP_XSTRING(bdb_delete) ": retrying...\n" );
rs->sr_err = TXN_ABORT( ltid );
ltid = NULL;
LDAP_SLIST_REMOVE( &op->o_extra, &opinfo.boi_oe, OpExtra, oe_next );
@ -111,12 +110,12 @@ retry: /* transaction retry */
rs->sr_err = TXN_BEGIN( bdb->bi_dbenv, NULL, &ltid, tflags );
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 );
ltid->id(ltid) );
rs->sr_text = NULL;
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_delete) ": txn_begin failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
@ -163,7 +162,7 @@ retry: /* transaction retry */
if ( e == NULL || ( !manageDSAit && is_entry_glue( e ))) {
Debug( LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_delete) ": no such object %s\n",
op->o_req_dn.bv_val, 0, 0);
op->o_req_dn.bv_val );
if ( matched != NULL ) {
rs->sr_matched = ch_strdup( matched->e_dn );
@ -202,7 +201,7 @@ retry: /* transaction retry */
if( p == NULL || !bvmatch( &pdn, &p->e_nname )) {
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": parent "
"does not exist\n", 0, 0, 0 );
"does not exist\n" );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "could not locate parent of entry";
goto return_results;
@ -221,7 +220,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": no write "
"access to parent\n", 0, 0, 0 );
"access to parent\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to parent";
goto return_results;
@ -249,8 +248,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete)
": no access to parent\n",
0, 0, 0 );
": no access to parent\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to parent";
goto return_results;
@ -259,7 +257,7 @@ retry: /* transaction retry */
} else {
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete)
": no parent and not root\n", 0, 0, 0 );
": no parent and not root\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
}
@ -285,7 +283,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": no write access "
"to entry\n", 0, 0, 0 );
"to entry\n" );
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
rs->sr_text = "no write access to entry";
goto return_results;
@ -296,8 +294,7 @@ retry: /* transaction retry */
rs->sr_ref = get_entry_referrals( op, e );
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_delete) ": entry is referral\n",
0, 0, 0 );
LDAP_XSTRING(bdb_delete) ": entry is referral\n" );
rs->sr_err = LDAP_REFERRAL;
rs->sr_matched = ch_strdup( e->e_name.bv_val );
@ -316,7 +313,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": pre-read "
"failed!\n", 0, 0, 0 );
"failed!\n" );
if ( op->o_preread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */
@ -332,13 +329,13 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_delete) ": txn_begin(2) failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_delete) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 );
lt2->id(lt2) );
BDB_LOG_PRINTF( bdb->bi_dbenv, lt2, "slapd Starting delete %s(%d)",
e->e_nname.bv_val, e->e_id );
@ -354,7 +351,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_delete)
": non-leaf %s\n",
op->o_req_dn.bv_val, 0, 0);
op->o_req_dn.bv_val );
rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
rs->sr_text = "subordinate objects must be deleted first";
break;
@ -362,7 +359,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_delete)
": has_children failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
}
@ -374,7 +371,7 @@ retry: /* transaction retry */
if ( rs->sr_err != 0 ) {
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": dn2id failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -390,7 +387,7 @@ retry: /* transaction retry */
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": index failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -427,7 +424,7 @@ retry: /* transaction retry */
if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_delete) ": id2entry failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -452,7 +449,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_delete)
": has_children failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;

2
servers/slapd/back-bdb/dn2entry.c
View file

@ -40,7 +40,7 @@ bdb_dn2entry(
int rc, rc2;
Debug(LDAP_DEBUG_TRACE, "bdb_dn2entry(\"%s\")\n",
dn->bv_val, 0, 0 );
dn->bv_val );
*e = NULL;

36
servers/slapd/back-bdb/dn2id.c
View file

@ -40,7 +40,7 @@ bdb_dn2id_add(
struct berval ptr, pdn;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_add 0x%lx: \"%s\"\n",
e->e_id, e->e_ndn, 0 );
e->e_id, e->e_ndn );
assert( e->e_id != NOID );
DBTzero( &key );
@ -136,7 +136,7 @@ bdb_dn2id_add(
done:
op->o_tmpfree( buf, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_add 0x%lx: %d\n", e->e_id, rc );
return rc;
}
@ -155,7 +155,7 @@ bdb_dn2id_delete(
int rc;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_delete 0x%lx: \"%s\"\n",
e->e_id, e->e_ndn, 0 );
e->e_id, e->e_ndn );
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
@ -240,7 +240,7 @@ bdb_dn2id_delete(
done:
op->o_tmpfree( buf, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc );
return rc;
}
@ -258,7 +258,7 @@ bdb_dn2id(
DBT key, data;
ID nid;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id(\"%s\")\n", dn->bv_val, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id(\"%s\")\n", dn->bv_val );
DBTzero( &key );
key.size = dn->bv_len + 2;
@ -280,11 +280,11 @@ bdb_dn2id(
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
db_strerror( rc ), rc );
} else {
BDB_DISK2ID( &nid, &ei->bei_id );
Debug( LDAP_DEBUG_TRACE, "<= bdb_dn2id: got id=0x%lx\n",
ei->bei_id, 0, 0 );
ei->bei_id );
}
op->o_tmpfree( key.data, op->o_tmpmemctx );
return rc;
@ -303,7 +303,7 @@ bdb_dn2id_children(
int rc;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2id_children(\"%s\")\n",
e->e_nname.bv_val, 0, 0 );
e->e_nname.bv_val );
DBTzero( &key );
key.size = e->e_nname.bv_len + 2;
key.data = op->o_tmpalloc( key.size, op->o_tmpmemctx );
@ -353,7 +353,7 @@ bdb_dn2idl(
? DN_ONE_PREFIX : DN_SUBTREE_PREFIX;
Debug( LDAP_DEBUG_TRACE, "=> bdb_dn2idl(\"%s\")\n",
ndn->bv_val, 0, 0 );
ndn->bv_val );
#ifndef BDB_MULTIPLE_SUFFIXES
if ( prefix == DN_SUBTREE_PREFIX
@ -378,7 +378,7 @@ bdb_dn2idl(
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_dn2idl: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
db_strerror( rc ), rc );
} else {
Debug( LDAP_DEBUG_TRACE,
@ -516,7 +516,7 @@ hdb_dn2id_add(
char *ptr;
Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id_add 0x%lx: \"%s\"\n",
e->e_id, e->e_ndn, 0 );
e->e_id, e->e_ndn );
nrlen = dn_rdnlen( op->o_bd, &e->e_nname );
if (nrlen) {
@ -593,7 +593,7 @@ hdb_dn2id_add(
}
op->o_tmpfree( d, op->o_tmpmemctx );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc, 0 );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_add 0x%lx: %d\n", e->e_id, rc );
return rc;
}
@ -615,7 +615,7 @@ hdb_dn2id_delete(
unsigned char dlen[2];
Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id_delete 0x%lx: \"%s\"\n",
e->e_id, e->e_ndn, 0 );
e->e_id, e->e_ndn );
DBTzero(&key);
key.size = sizeof(ID);
@ -689,7 +689,7 @@ func_leave:
}
}
}
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc, 0 );
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id_delete 0x%lx: %d\n", e->e_id, rc );
return rc;
}
@ -711,7 +711,7 @@ hdb_dn2id(
unsigned char dlen[2];
ID idp, parentID;
Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id(\"%s\")\n", in->bv_val, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2id(\"%s\")\n", in->bv_val );
nrlen = dn_rdnlen( op->o_bd, in );
if (!nrlen) nrlen = in->bv_len;
@ -767,10 +767,10 @@ hdb_dn2id(
op->o_tmpfree( d, op->o_tmpmemctx );
if( rc != 0 ) {
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id: get failed: %s (%d)\n",
db_strerror( rc ), rc, 0 );
db_strerror( rc ), rc );
} else {
Debug( LDAP_DEBUG_TRACE, "<= hdb_dn2id: got id=0x%lx\n",
ei->bei_id, 0, 0 );
ei->bei_id );
}
return rc;
@ -1151,7 +1151,7 @@ hdb_dn2idl(
struct dn2id_cookie cx;
Debug( LDAP_DEBUG_TRACE, "=> hdb_dn2idl(\"%s\")\n",
ndn->bv_val, 0, 0 );
ndn->bv_val );
#ifndef BDB_MULTIPLE_SUFFIXES
if ( op->ors_scope != LDAP_SCOPE_ONELEVEL &&

4
servers/slapd/back-bdb/error.c
View file

@ -32,7 +32,7 @@ void bdb_errcall( const DB_ENV *env, const char *pfx, const char * msg )
if ( msg[0] > 0x7f )
__etoa( msg );
#endif
Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg, 0 );
Debug( LDAP_DEBUG_ANY, "bdb(%s): %s\n", pfx, msg );
}
#if DB_VERSION_FULL >= 0x04030000
@ -42,7 +42,7 @@ void bdb_msgcall( const DB_ENV *env, const char *msg )
if ( msg[0] > 0x7f )
__etoa( msg );
#endif
Debug( LDAP_DEBUG_TRACE, "bdb: %s\n", msg, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "bdb: %s\n", msg );
}
#endif

96
servers/slapd/back-bdb/filterindex.c
View file

@ -110,7 +110,7 @@ bdb_filter_candidates(
#ifdef LDAP_COMP_MATCH
AttributeAliasing *aa;
#endif
Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "=> bdb_filter_candidates\n" );
if ( f->f_choice & SLAPD_FILTER_UNDEFINED ) {
BDB_IDL_ZERO( ids );
@ -138,12 +138,12 @@ bdb_filter_candidates(
}
break;
case LDAP_FILTER_PRESENT:
Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tPRESENT\n" );
rc = presence_candidates( op, rtxn, f->f_desc, ids );
break;
case LDAP_FILTER_EQUALITY:
Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tEQUALITY\n" );
#ifdef LDAP_COMP_MATCH
if ( is_aliased_attribute && ( aa = is_aliased_attribute ( f->f_ava->aa_desc ) ) ) {
rc = ava_comp_candidates ( op, rtxn, f->f_ava, aa, ids, tmp, stack );
@ -156,18 +156,18 @@ bdb_filter_candidates(
break;
case LDAP_FILTER_APPROX:
Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tAPPROX\n" );
rc = approx_candidates( op, rtxn, f->f_ava, ids, tmp );
break;
case LDAP_FILTER_SUBSTRINGS:
Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tSUBSTRINGS\n" );
rc = substring_candidates( op, rtxn, f->f_sub, ids, tmp );
break;
case LDAP_FILTER_GE:
/* if no GE index, use pres */
Debug( LDAP_DEBUG_FILTER, "\tGE\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tGE\n" );
if( f->f_ava->aa_desc->ad_type->sat_ordering &&
( f->f_ava->aa_desc->ad_type->sat_ordering->smr_usage & SLAP_MR_ORDERED_INDEX ) )
rc = inequality_candidates( op, rtxn, f->f_ava, ids, tmp, LDAP_FILTER_GE );
@ -177,7 +177,7 @@ bdb_filter_candidates(
case LDAP_FILTER_LE:
/* if no LE index, use pres */
Debug( LDAP_DEBUG_FILTER, "\tLE\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tLE\n" );
if( f->f_ava->aa_desc->ad_type->sat_ordering &&
( f->f_ava->aa_desc->ad_type->sat_ordering->smr_usage & SLAP_MR_ORDERED_INDEX ) )
rc = inequality_candidates( op, rtxn, f->f_ava, ids, tmp, LDAP_FILTER_LE );
@ -187,30 +187,30 @@ bdb_filter_candidates(
case LDAP_FILTER_NOT:
/* no indexing to support NOT filters */
Debug( LDAP_DEBUG_FILTER, "\tNOT\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tNOT\n" );
{ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
BDB_IDL_ALL( bdb, ids );
}
break;
case LDAP_FILTER_AND:
Debug( LDAP_DEBUG_FILTER, "\tAND\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tAND\n" );
rc = list_candidates( op, rtxn,
f->f_and, LDAP_FILTER_AND, ids, tmp, stack );
break;
case LDAP_FILTER_OR:
Debug( LDAP_DEBUG_FILTER, "\tOR\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tOR\n" );
rc = list_candidates( op, rtxn,
f->f_or, LDAP_FILTER_OR, ids, tmp, stack );
break;
case LDAP_FILTER_EXT:
Debug( LDAP_DEBUG_FILTER, "\tEXT\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tEXT\n" );
rc = ext_candidates( op, rtxn, f->f_mra, ids, tmp, stack );
break;
default:
Debug( LDAP_DEBUG_FILTER, "\tUNKNOWN %lu\n",
(unsigned long) f->f_choice, 0, 0 );
(unsigned long) f->f_choice );
/* Must not return NULL, otherwise extended filters break */
{ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
BDB_IDL_ALL( bdb, ids );
@ -242,7 +242,7 @@ comp_list_candidates(
int rc = 0;
ComponentFilter *f;
Debug( LDAP_DEBUG_FILTER, "=> comp_list_candidates 0x%x\n", ftype, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "=> comp_list_candidates 0x%x\n", ftype );
for ( f = flist; f != NULL; f = f->cf_next ) {
/* ignore precomputed scopes */
if ( f->cf_choice == SLAPD_FILTER_COMPUTED &&
@ -287,7 +287,7 @@ comp_list_candidates(
} else {
Debug( LDAP_DEBUG_FILTER,
"<= comp_list_candidates: undefined rc=%d\n",
rc, 0, 0 );
rc );
}
return rc;
@ -442,7 +442,7 @@ comp_candidates (
if ( !f ) return LDAP_PROTOCOL_ERROR;
Debug( LDAP_DEBUG_FILTER, "comp_candidates\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "comp_candidates\n" );
switch ( f->cf_choice ) {
case SLAPD_FILTER_COMPUTED:
rc = f->cf_result;
@ -455,7 +455,7 @@ comp_candidates (
break;
case LDAP_COMP_FILTER_NOT:
/* No component indexing supported for NOT filter */
Debug( LDAP_DEBUG_FILTER, "\tComponent NOT\n", 0, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "\tComponent NOT\n" );
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
BDB_IDL_ALL( bdb, ids );
@ -570,7 +570,7 @@ list_candidates(
int rc = 0;
Filter *f;
Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype, 0, 0 );
Debug( LDAP_DEBUG_FILTER, "=> bdb_list_candidates 0x%x\n", ftype );
for ( f = flist; f != NULL; f = f->f_next ) {
/* ignore precomputed scopes */
if ( f->f_choice == SLAPD_FILTER_COMPUTED &&
@ -620,7 +620,7 @@ list_candidates(
} else {
Debug( LDAP_DEBUG_FILTER,
"<= bdb_list_candidates: undefined rc=%d\n",
rc, 0, 0 );
rc );
}
return rc;
@ -640,7 +640,7 @@ presence_candidates(
struct berval prefix = {0, NULL};
Debug( LDAP_DEBUG_TRACE, "=> bdb_presence_candidates (%s)\n",
desc->ad_cname.bv_val, 0, 0 );
desc->ad_cname.bv_val );
BDB_IDL_ALL( bdb, ids );
@ -655,7 +655,7 @@ presence_candidates(
/* not indexed */
Debug( LDAP_DEBUG_TRACE,
"<= bdb_presence_candidates: (%s) not indexed\n",
desc->ad_cname.bv_val, 0, 0 );
desc->ad_cname.bv_val );
return 0;
}
@ -663,14 +663,14 @@ presence_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_presence_candidates: (%s) index_param "
"returned=%d\n",
desc->ad_cname.bv_val, rc, 0 );
desc->ad_cname.bv_val, rc );
return 0;
}
if( prefix.bv_val == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_presence_candidates: (%s) no prefix\n",
desc->ad_cname.bv_val, 0, 0 );
desc->ad_cname.bv_val );
return -1;
}
@ -683,7 +683,7 @@ presence_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_presense_candidates: (%s) "
"key read failed (%d)\n",
desc->ad_cname.bv_val, rc, 0 );
desc->ad_cname.bv_val, rc );
goto done;
}
@ -715,7 +715,7 @@ equality_candidates(
MatchingRule *mr;
Debug( LDAP_DEBUG_TRACE, "=> bdb_equality_candidates (%s)\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
if ( ava->aa_desc == slap_schema.si_ad_entryDN ) {
EntryInfo *ei = NULL;
@ -743,7 +743,7 @@ equality_candidates(
if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_equality_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -751,7 +751,7 @@ equality_candidates(
Debug( LDAP_DEBUG_ANY,
"<= bdb_equality_candidates: (%s) "
"index_param failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
return 0;
}
@ -784,7 +784,7 @@ equality_candidates(
if( keys == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_equality_candidates: (%s) no keys\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -799,14 +799,14 @@ equality_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_equality_candidates: (%s) "
"key read failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_equality_candidates: (%s) NULL\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
BDB_IDL_ZERO( ids );
break;
}
@ -850,7 +850,7 @@ approx_candidates(
MatchingRule *mr;
Debug( LDAP_DEBUG_TRACE, "=> bdb_approx_candidates (%s)\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
BDB_IDL_ALL( bdb, ids );
@ -860,7 +860,7 @@ approx_candidates(
if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_approx_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -868,7 +868,7 @@ approx_candidates(
Debug( LDAP_DEBUG_ANY,
"<= bdb_approx_candidates: (%s) "
"index_param failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
return 0;
}
@ -906,7 +906,7 @@ approx_candidates(
if( keys == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_approx_candidates: (%s) no keys (%s)\n",
prefix.bv_val, ava->aa_desc->ad_cname.bv_val, 0 );
prefix.bv_val, ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -921,14 +921,14 @@ approx_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_approx_candidates: (%s) "
"key read failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_approx_candidates: (%s) NULL\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
BDB_IDL_ZERO( ids );
break;
}
@ -970,7 +970,7 @@ substring_candidates(
MatchingRule *mr;
Debug( LDAP_DEBUG_TRACE, "=> bdb_substring_candidates (%s)\n",
sub->sa_desc->ad_cname.bv_val, 0, 0 );
sub->sa_desc->ad_cname.bv_val );
BDB_IDL_ALL( bdb, ids );
@ -980,7 +980,7 @@ substring_candidates(
if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_substring_candidates: (%s) not indexed\n",
sub->sa_desc->ad_cname.bv_val, 0, 0 );
sub->sa_desc->ad_cname.bv_val );
return 0;
}
@ -988,7 +988,7 @@ substring_candidates(
Debug( LDAP_DEBUG_ANY,
"<= bdb_substring_candidates: (%s) "
"index_param failed (%d)\n",
sub->sa_desc->ad_cname.bv_val, rc, 0 );
sub->sa_desc->ad_cname.bv_val, rc );
return 0;
}
@ -1015,14 +1015,14 @@ substring_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_substring_candidates: (%s) "
"MR filter failed (%d)\n",
sub->sa_desc->ad_cname.bv_val, rc, 0 );
sub->sa_desc->ad_cname.bv_val, rc );
return 0;
}
if( keys == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_substring_candidates: (0x%04lx) no keys (%s)\n",
mask, sub->sa_desc->ad_cname.bv_val, 0 );
mask, sub->sa_desc->ad_cname.bv_val );
return 0;
}
@ -1037,14 +1037,14 @@ substring_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_substring_candidates: (%s) "
"key read failed (%d)\n",
sub->sa_desc->ad_cname.bv_val, rc, 0 );
sub->sa_desc->ad_cname.bv_val, rc );
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_substring_candidates: (%s) NULL\n",
sub->sa_desc->ad_cname.bv_val, 0, 0 );
sub->sa_desc->ad_cname.bv_val );
BDB_IDL_ZERO( ids );
break;
}
@ -1087,7 +1087,7 @@ inequality_candidates(
DBC * cursor = NULL;
Debug( LDAP_DEBUG_TRACE, "=> bdb_inequality_candidates (%s)\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
BDB_IDL_ALL( bdb, ids );
@ -1097,7 +1097,7 @@ inequality_candidates(
if ( rc == LDAP_INAPPROPRIATE_MATCHING ) {
Debug( LDAP_DEBUG_ANY,
"<= bdb_inequality_candidates: (%s) not indexed\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -1105,7 +1105,7 @@ inequality_candidates(
Debug( LDAP_DEBUG_ANY,
"<= bdb_inequality_candidates: (%s) "
"index_param failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
return 0;
}
@ -1138,7 +1138,7 @@ inequality_candidates(
if( keys == NULL ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_inequality_candidates: (%s) no keys\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
return 0;
}
@ -1153,14 +1153,14 @@ inequality_candidates(
Debug( LDAP_DEBUG_TRACE,
"<= bdb_inequality_candidates: (%s) "
"key read failed (%d)\n",
ava->aa_desc->ad_cname.bv_val, rc, 0 );
ava->aa_desc->ad_cname.bv_val, rc );
break;
}
if( BDB_IDL_IS_ZERO( tmp ) ) {
Debug( LDAP_DEBUG_TRACE,
"<= bdb_inequality_candidates: (%s) NULL\n",
ava->aa_desc->ad_cname.bv_val, 0, 0 );
ava->aa_desc->ad_cname.bv_val );
break;
}

14
servers/slapd/back-bdb/id2entry.c
View file

@ -330,10 +330,10 @@ int bdb_entry_get(
DB_LOCK lock;
Debug( LDAP_DEBUG_ARGS,
"=> bdb_entry_get: ndn: \"%s\"\n", ndn->bv_val, 0, 0 );
"=> bdb_entry_get: ndn: \"%s\"\n", ndn->bv_val );
Debug( LDAP_DEBUG_ARGS,
"=> bdb_entry_get: oc: \"%s\", at: \"%s\"\n",
oc ? oc->soc_cname.bv_val : "(null)", at_name, 0);
oc ? oc->soc_cname.bv_val : "(null)", at_name );
if( op ) {
OpExtra *oex;
@ -379,18 +379,18 @@ dn2entry_retry:
if (e == NULL) {
Debug( LDAP_DEBUG_ACL,
"=> bdb_entry_get: cannot find entry: \"%s\"\n",
ndn->bv_val, 0, 0 );
ndn->bv_val );
return LDAP_NO_SUCH_OBJECT;
}
Debug( LDAP_DEBUG_ACL,
"=> bdb_entry_get: found entry: \"%s\"\n",
ndn->bv_val, 0, 0 );
ndn->bv_val );
if ( oc && !is_entry_objectclass( e, oc, 0 )) {
Debug( LDAP_DEBUG_ACL,
"<= bdb_entry_get: failed to find objectClass %s\n",
oc->soc_cname.bv_val, 0, 0 );
oc->soc_cname.bv_val );
rc = LDAP_NO_SUCH_ATTRIBUTE;
goto return_results;
}
@ -399,7 +399,7 @@ dn2entry_retry:
if ( at && attr_find( e->e_attrs, at ) == NULL ) {
Debug( LDAP_DEBUG_ACL,
"<= bdb_entry_get: failed to find attribute %s\n",
at->ad_cname.bv_val, 0, 0 );
at->ad_cname.bv_val );
rc = LDAP_NO_SUCH_ATTRIBUTE;
goto return_results;
}
@ -441,6 +441,6 @@ return_results:
Debug( LDAP_DEBUG_TRACE,
"bdb_entry_get: rc=%d\n",
rc, 0, 0 );
rc );
return(rc);
}

47
servers/slapd/back-bdb/idl.c
View file

@ -81,16 +81,16 @@ static void idl_dump( ID *ids )
} else {
ID i;
Debug( LDAP_DEBUG_ANY, "IDL: size %ld", (long) ids[0], 0, 0 );
Debug( LDAP_DEBUG_ANY, "IDL: size %ld", (long) ids[0] );
for( i=1; i<=ids[0]; i++ ) {
if( i % 16 == 1 ) {
Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY, "\n" );
}
Debug( LDAP_DEBUG_ANY, " %02lx", (long) ids[i], 0, 0 );
Debug( LDAP_DEBUG_ANY, " %02lx", (long) ids[i] );
}
Debug( LDAP_DEBUG_ANY, "\n", 0, 0, 0 );
Debug( LDAP_DEBUG_ANY, "\n" );
}
idl_check( ids );
@ -161,7 +161,7 @@ int bdb_idl_insert( ID *ids, ID id )
unsigned x;
#if IDL_DEBUG > 1
Debug( LDAP_DEBUG_ANY, "insert: %04lx at %d\n", (long) id, x, 0 );
Debug( LDAP_DEBUG_ANY, "insert: %04lx at %d\n", (long) id, x );
idl_dump( ids );
#elif IDL_DEBUG > 0
idl_check( ids );
@ -222,7 +222,7 @@ int bdb_idl_delete( ID *ids, ID id )
unsigned x;
#if IDL_DEBUG > 1
Debug( LDAP_DEBUG_ANY, "delete: %04lx at %d\n", (long) id, x, 0 );
Debug( LDAP_DEBUG_ANY, "delete: %04lx at %d\n", (long) id, x );
idl_dump( ids );
#elif IDL_DEBUG > 0
idl_check( ids );
@ -389,8 +389,7 @@ bdb_idl_cache_put(
if ( avl_delete( &bdb->bi_idl_tree, (caddr_t) ee,
bdb_idl_entry_cmp ) == NULL ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_cache_put: "
"AVL delete failed\n",
0, 0, 0 );
"AVL delete failed\n" );
}
IDL_LRU_DELETE( bdb, ee );
i++;
@ -424,8 +423,7 @@ bdb_idl_cache_del(
if ( avl_delete( &bdb->bi_idl_tree, (caddr_t) matched_idl_entry,
bdb_idl_entry_cmp ) == NULL ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_cache_del: "
"AVL delete failed\n",
0, 0, 0 );
"AVL delete failed\n" );
}
--bdb->bi_idl_cache_size;
ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
@ -482,8 +480,7 @@ bdb_idl_cache_del_id(
if ( avl_delete( &bdb->bi_idl_tree, (caddr_t) cache_entry,
bdb_idl_entry_cmp ) == NULL ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_cache_del: "
"AVL delete failed\n",
0, 0, 0 );
"AVL delete failed\n" );
}
--bdb->bi_idl_cache_size;
ldap_pvt_thread_mutex_lock( &bdb->bi_idl_tree_lrulock );
@ -546,7 +543,7 @@ bdb_idl_fetch_key(
Debug( LDAP_DEBUG_ARGS,
"bdb_idl_fetch_key: %s\n",
bdb_show_key( key, keybuf ), 0, 0 );
bdb_show_key( key, keybuf ) );
assert( ids != NULL );
@ -577,7 +574,7 @@ bdb_idl_fetch_key(
rc = db->cursor( db, txn, &cursor, bdb->bi_db_opflags );
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
"cursor failed: %s (%d)\n", db_strerror(rc), rc );
return rc;
}
} else {
@ -635,7 +632,7 @@ bdb_idl_fetch_key(
if (ids[0] != BDB_IDL_RANGE_SIZE) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"range size mismatch: expected %d, got %ld\n",
BDB_IDL_RANGE_SIZE, ids[0], 0 );
BDB_IDL_RANGE_SIZE, ids[0] );
cursor->c_close( cursor );
return -1;
}
@ -653,7 +650,7 @@ bdb_idl_fetch_key(
rc2 = cursor->c_close( cursor );
if (rc2) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"close failed: %s (%d)\n", db_strerror(rc2), rc2, 0 );
"close failed: %s (%d)\n", db_strerror(rc2), rc2 );
return rc2;
}
@ -663,21 +660,21 @@ bdb_idl_fetch_key(
} else if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
return rc;
} else if ( data.size == 0 || data.size % sizeof( ID ) ) {
/* size not multiple of ID size */
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"odd size: expected %ld multiple, got %ld\n",
(long) sizeof( ID ), (long) data.size, 0 );
(long) sizeof( ID ), (long) data.size );
return -1;
} else if ( data.size != BDB_IDL_SIZEOF(ids) ) {
/* size mismatch */
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_fetch_key: "
"get size mismatch: expected %ld, got %ld\n",
(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size, 0 );
(long) ((1 + ids[0]) * sizeof( ID )), (long) data.size );
return -1;
}
@ -708,7 +705,7 @@ bdb_idl_insert_key(
char buf[16];
Debug( LDAP_DEBUG_ARGS,
"bdb_idl_insert_key: %lx %s\n",
(long) id, bdb_show_key( key, buf ), 0 );
(long) id, bdb_show_key( key, buf ) );
}
assert( id != NOID );
@ -723,7 +720,7 @@ bdb_idl_insert_key(
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
"cursor failed: %s (%d)\n", db_strerror(rc), rc );
return rc;
}
data.data = &nlo;
@ -895,7 +892,7 @@ fail:
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_insert_key: "
"c_close failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
}
return rc;
}
@ -919,7 +916,7 @@ bdb_idl_delete_key(
char buf[16];
Debug( LDAP_DEBUG_ARGS,
"bdb_idl_delete_key: %lx %s\n",
(long) id, bdb_show_key( key, buf ), 0 );
(long) id, bdb_show_key( key, buf ) );
}
assert( id != NOID );
@ -938,7 +935,7 @@ bdb_idl_delete_key(
rc = db->cursor( db, tid, &cursor, bdb->bi_db_opflags );
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "=> bdb_idl_delete_key: "
"cursor failed: %s (%d)\n", db_strerror(rc), rc, 0 );
"cursor failed: %s (%d)\n", db_strerror(rc), rc );
return rc;
}
/* Fetch the first data item for this key, to see if it
@ -1033,7 +1030,7 @@ fail:
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"=> bdb_idl_delete_key: c_close failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
}
return rc;

2
servers/slapd/back-bdb/index.c
View file

@ -190,7 +190,7 @@ static int indexer(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"bdb_index_read: Could not open DB %s\n",
atname->bv_val, 0, 0 );
atname->bv_val );
return LDAP_OTHER;
}

50
servers/slapd/back-bdb/init.c
View file

@ -53,8 +53,7 @@ bdb_db_init( BackendDB *be, ConfigReply *cr )
int rc;
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_db_init) ": Initializing " BDB_UCTYPE " database\n",
0, 0, 0 );
LDAP_XSTRING(bdb_db_init) ": Initializing " BDB_UCTYPE " database\n" );
/* allocate backend-database-specific stuff */
bdb = (struct bdb_info *) ch_calloc( 1, sizeof(struct bdb_info) );
@ -115,14 +114,13 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
if ( be->be_suffix == NULL ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": need suffix.\n",
0, 0, 0 );
LDAP_XSTRING(bdb_db_open) ": need suffix.\n" );
return -1;
}
Debug( LDAP_DEBUG_ARGS,
LDAP_XSTRING(bdb_db_open) ": \"%s\"\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
/* Check existence of dbenv_home. Any error means trouble */
rc = stat( bdb->bi_dbenv_home, &stat1 );
@ -153,20 +151,20 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"unclean shutdown detected; attempting recovery.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
do_alock_recover = 1;
do_recover = DB_RECOVER;
} else if( rc == ALOCK_BUSY ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"database already in use.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
return -1;
} else if( rc != ALOCK_CLEAN ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"alock package is unstable.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
return -1;
}
if ( rc == ALOCK_CLEAN )
@ -186,18 +184,16 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
if( stat2.st_mtime < stat1.st_mtime ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": DB_CONFIG for suffix \"%s\" has changed.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
if ( quick ) {
Debug( LDAP_DEBUG_ANY,
"Cannot use Quick mode; perform manual recovery first.\n",
0, 0, 0 );
"Cannot use Quick mode; perform manual recovery first.\n" );
slapMode ^= SLAP_TOOL_QUICK;
rc = -1;
goto fail;
} else {
Debug( LDAP_DEBUG_ANY,
"Performing database recovery to activate new settings.\n",
0, 0, 0 );
"Performing database recovery to activate new settings.\n" );
}
do_recover = DB_RECOVER;
}
@ -221,7 +217,7 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"recovery skipped in read-only mode. "
"Run manual recovery if errors are encountered.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
do_recover = 0;
do_alock_recover = 0;
quick = alockt;
@ -232,7 +228,7 @@ bdb_db_open( BackendDB *be, ConfigReply *cr )
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"cannot recover, database must be reinitialized.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
rc = -1;
goto fail;
}
@ -315,7 +311,7 @@ shm_retry:
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": "
"dbenv_open(%s).\n",
be->be_suffix[0].bv_val, bdb->bi_dbenv_home, 0);
be->be_suffix[0].bv_val, bdb->bi_dbenv_home );
flags = DB_INIT_MPOOL | DB_CREATE | DB_THREAD;
@ -341,7 +337,7 @@ shm_retry:
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_db_open)
": database \"%s\": "
"shared memory env open failed, assuming stale env.\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
do_retry = 0;
goto shm_retry;
}
@ -356,7 +352,7 @@ shm_retry:
if ( do_alock_recover && alock_recover (&bdb->bi_alock_info) != 0 ) {
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": database \"%s\": alock_recover failed\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
rc = -1;
goto fail;
}
@ -405,7 +401,7 @@ shm_retry:
bdb->bi_dbenv_home, db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n",
cr->msg, 0, 0 );
cr->msg );
ch_free( db );
goto fail;
}
@ -419,7 +415,7 @@ shm_retry:
bdb->bi_dbenv_home, db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n",
cr->msg, 0, 0 );
cr->msg );
db->bdi_db->close( db->bdi_db, 0 );
ch_free( db );
goto fail;
@ -435,7 +431,7 @@ shm_retry:
bdb->bi_dbenv_home, db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n",
cr->msg, 0, 0 );
cr->msg );
db->bdi_db->close( db->bdi_db, 0 );
ch_free( db );
goto fail;
@ -507,7 +503,7 @@ shm_retry:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n",
cr->msg, 0, 0 );
cr->msg );
db->bdi_db->close( db->bdi_db, 0 );
ch_free( db );
goto fail;
@ -530,7 +526,7 @@ shm_retry:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_db_open) ": %s\n",
cr->msg, 0, 0 );
cr->msg );
goto fail;
}
@ -683,7 +679,7 @@ bdb_db_close( BackendDB *be, ConfigReply *cr )
if( rc != 0 ) {
Debug( LDAP_DEBUG_ANY,
"bdb_db_close: database \"%s\": alock_close failed\n",
be->be_suffix[0].bv_val, 0, 0 );
be->be_suffix[0].bv_val );
return -1;
}
@ -757,7 +753,7 @@ bdb_back_initialize(
/* initialize the underlying database system */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_back_initialize) ": initialize "
BDB_UCTYPE " backend\n", 0, 0, 0 );
BDB_UCTYPE " backend\n" );
bi->bi_flags |=
SLAP_BFLAG_INCREMENT |
@ -789,12 +785,12 @@ bdb_back_initialize(
LDAP_XSTRING(bdb_back_initialize) ": "
"BDB library version mismatch:"
" expected " DB_VERSION_STRING ","
" got %s\n", version, 0, 0 );
" got %s\n", version );
return -1;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_back_initialize)
": %s\n", version, 0, 0 );
": %s\n", version );
}
db_env_set_func_free( ber_memfree );

10
servers/slapd/back-bdb/key.c
View file

@ -40,7 +40,7 @@ bdb_key_read(
int rc;
DBT key;
Debug( LDAP_DEBUG_TRACE, "=> key_read\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "=> key_read\n" );
DBTzero( &key );
bv2DBT(k,&key);
@ -51,10 +51,10 @@ bdb_key_read(
if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read: failed (%d)\n",
rc, 0, 0 );
rc );
} else {
Debug( LDAP_DEBUG_TRACE, "<= bdb_index_read %ld candidates\n",
(long) BDB_IDL_N(ids), 0, 0 );
(long) BDB_IDL_N(ids) );
}
return rc;
@ -75,7 +75,7 @@ bdb_key_change(
DBT key;
Debug( LDAP_DEBUG_TRACE, "=> key_change(%s,%lx)\n",
op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id, 0 );
op == SLAP_INDEX_ADD_OP ? "ADD":"DELETE", (long) id );
DBTzero( &key );
bv2DBT(k,&key);
@ -98,7 +98,7 @@ bdb_key_change(
if ( rc == DB_NOTFOUND ) rc = 0;
}
Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "<= key_change %d\n", rc );
return rc;
}

65
servers/slapd/back-bdb/modify.c
View file

@ -83,7 +83,7 @@ int bdb_modify_internal(
int got_delete;
Debug( LDAP_DEBUG_TRACE, "bdb_modify_internal: 0x%08lx: %s\n",
e->e_id, e->e_dn, 0);
e->e_id, e->e_dn );
if ( !acl_check_modlist( op, e, modlist )) {
return LDAP_INSUFFICIENT_ACCESS;
@ -133,12 +133,12 @@ int bdb_modify_internal(
case LDAP_MOD_ADD:
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: add %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
err = modify_add_values( e, mod, get_permissiveModify(op),
text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
}
break;
@ -150,12 +150,12 @@ int bdb_modify_internal(
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: delete %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
err = modify_delete_values( e, mod, get_permissiveModify(op),
text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
} else {
got_delete = 1;
}
@ -164,12 +164,12 @@ int bdb_modify_internal(
case LDAP_MOD_REPLACE:
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: replace %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
err = modify_replace_values( e, mod, get_permissiveModify(op),
text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
} else {
got_delete = 1;
}
@ -178,13 +178,13 @@ int bdb_modify_internal(
case LDAP_MOD_INCREMENT:
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: increment %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
err = modify_increment_values( e, mod, get_permissiveModify(op),
text, textbuf, textlen );
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
} else {
got_delete = 1;
}
@ -193,7 +193,7 @@ int bdb_modify_internal(
case SLAP_MOD_SOFTADD:
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: softadd %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
/* Avoid problems in index_add_mods()
* We need to add index if necessary.
*/
@ -210,14 +210,14 @@ int bdb_modify_internal(
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
}
break;
case SLAP_MOD_SOFTDEL:
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: softdel %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
/* Avoid problems in index_delete_mods()
* We need to add index if necessary.
*/
@ -236,7 +236,7 @@ int bdb_modify_internal(
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
}
break;
@ -249,7 +249,7 @@ int bdb_modify_internal(
Debug(LDAP_DEBUG_ARGS,
"bdb_modify_internal: add_if_not_present %s\n",
mod->sm_desc->ad_cname.bv_val, 0, 0);
mod->sm_desc->ad_cname.bv_val );
/* Avoid problems in index_add_mods()
* We need to add index if necessary.
*/
@ -262,17 +262,17 @@ int bdb_modify_internal(
if( err != LDAP_SUCCESS ) {
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
}
break;
default:
Debug(LDAP_DEBUG_ANY, "bdb_modify_internal: invalid op %d\n",
mod->sm_op, 0, 0);
mod->sm_op );
*text = "Invalid modify operation";
err = LDAP_OTHER;
Debug(LDAP_DEBUG_ARGS, "bdb_modify_internal: %d %s\n",
err, *text, 0);
err, *text );
}
if ( err != LDAP_SUCCESS ) {
@ -312,7 +312,7 @@ int bdb_modify_internal(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"entry failed schema check: %s\n",
*text, 0, 0 );
*text );
}
/* if NOOP then silently revert to saved attrs */
@ -365,7 +365,7 @@ int bdb_modify_internal(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"%s: attribute \"%s\" index delete failure\n",
op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 );
op->o_log_prefix, ap->a_desc->ad_cname.bv_val );
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
}
@ -430,7 +430,7 @@ int bdb_modify_internal(
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"%s: attribute \"%s\" index add failure\n",
op->o_log_prefix, ap->a_desc->ad_cname.bv_val, 0 );
op->o_log_prefix, ap->a_desc->ad_cname.bv_val );
attrs_free( e->e_attrs );
e->e_attrs = save_attrs;
return rc;
@ -467,7 +467,7 @@ bdb_modify( Operation *op, SlapReply *rs )
int rc;
Debug( LDAP_DEBUG_ARGS, LDAP_XSTRING(bdb_modify) ": %s\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
#ifdef LDAP_X_TXN
if( op->o_txnSpec && txn_preop( op, rs ))
@ -495,7 +495,7 @@ retry: /* transaction retry */
e = NULL;
}
Debug(LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": retrying...\n", 0, 0, 0);
LDAP_XSTRING(bdb_modify) ": retrying...\n" );
rs->sr_err = TXN_ABORT( ltid );
ltid = NULL;
@ -525,13 +525,13 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": txn_begin failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 );
ltid->id(ltid) );
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
@ -546,7 +546,7 @@ retry: /* transaction retry */
if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": dn2entry failed (%d)\n",
rs->sr_err, 0, 0 );
rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -601,8 +601,7 @@ retry: /* transaction retry */
rs->sr_ref = get_entry_referrals( op, e );
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": entry is referral\n",
0, 0, 0 );
LDAP_XSTRING(bdb_modify) ": entry is referral\n" );
rs->sr_err = LDAP_REFERRAL;
rs->sr_matched = e->e_name.bv_val;
@ -631,7 +630,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modify) ": pre-read "
"failed!\n", 0, 0, 0 );
"failed!\n" );
if ( op->o_preread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */
@ -646,13 +645,13 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": txn_begin(2) failed: " "%s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modify) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 );
lt2->id(lt2) );
/* Modify the entry */
dummy = *e;
rs->sr_err = bdb_modify_internal( op, lt2, op->orm_modlist,
@ -661,7 +660,7 @@ retry: /* transaction retry */
if( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": modify failed (%d)\n",
rs->sr_err, 0, 0 );
rs->sr_err );
if ( (rs->sr_err == LDAP_INSUFFICIENT_ACCESS) && opinfo.boi_err ) {
rs->sr_err = opinfo.boi_err;
}
@ -680,7 +679,7 @@ retry: /* transaction retry */
if ( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modify) ": id2entry update failed " "(%d)\n",
rs->sr_err, 0, 0 );
rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -706,7 +705,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modify)
": post-read failed!\n", 0, 0, 0 );
": post-read failed!\n" );
if ( op->o_postread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */

67
servers/slapd/back-bdb/modrdn.c
View file

@ -93,7 +93,7 @@ retry: /* transaction retry */
np = NULL;
}
Debug( LDAP_DEBUG_TRACE, "==>" LDAP_XSTRING(bdb_modrdn)
": retrying...\n", 0, 0, 0 );
": retrying...\n" );
rs->sr_err = TXN_ABORT( ltid );
ltid = NULL;
@ -125,13 +125,13 @@ retry: /* transaction retry */
if( rs->sr_err != 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn) ": txn_begin failed: "
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err, 0 );
"%s (%d)\n", db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn1 id: %x\n",
ltid->id(ltid), 0, 0 );
ltid->id(ltid) );
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
@ -204,8 +204,7 @@ retry: /* transaction retry */
goto retry;
}
Debug( LDAP_DEBUG_TRACE, "no access to entry\n", 0,
0, 0 );
Debug( LDAP_DEBUG_TRACE, "no access to entry\n" );
rs->sr_text = "no write access to old entry";
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
@ -222,7 +221,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_modrdn)
": non-leaf %s\n",
op->o_req_dn.bv_val, 0, 0);
op->o_req_dn.bv_val );
rs->sr_err = LDAP_NOT_ALLOWED_ON_NONLEAF;
rs->sr_text = "subtree rename not supported";
break;
@ -230,7 +229,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_modrdn)
": has_children failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
}
@ -244,7 +243,7 @@ retry: /* transaction retry */
rs->sr_ref = get_entry_referrals( op, e );
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn)
": entry %s is referral\n", e->e_dn, 0, 0 );
": entry %s is referral\n", e->e_dn );
rs->sr_err = LDAP_REFERRAL,
rs->sr_matched = e->e_name.bv_val;
@ -297,7 +296,7 @@ retry: /* transaction retry */
p = eip->bei_e;
if( p == NULL) {
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn)
": parent does not exist\n", 0, 0, 0);
": parent does not exist\n" );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "old entry's parent does not exist";
goto return_results;
@ -324,15 +323,14 @@ retry: /* transaction retry */
}
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
Debug( LDAP_DEBUG_TRACE, "no access to parent\n", 0,
0, 0 );
Debug( LDAP_DEBUG_TRACE, "no access to parent\n" );
rs->sr_text = "no write access to old parent's children";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn) ": wr to children "
"of entry %s OK\n", p_ndn.bv_val, 0, 0 );
"of entry %s OK\n", p_ndn.bv_val );
if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
p_dn = slap_empty_bv;
@ -342,7 +340,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn) ": parent dn=%s\n",
p_dn.bv_val, 0, 0 );
p_dn.bv_val );
new_parent_dn = &p_dn; /* New Parent unless newSuperior given */
@ -350,13 +348,13 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": new parent \"%s\" requested...\n",
op->oq_modrdn.rs_newSup->bv_val, 0, 0 );
op->oq_modrdn.rs_newSup->bv_val );
/* newSuperior == oldParent? */
if( dn_match( &p_ndn, op->oq_modrdn.rs_nnewSup ) ) {
Debug( LDAP_DEBUG_TRACE, "bdb_back_modrdn: "
"new parent \"%s\" same as the old parent \"%s\"\n",
op->oq_modrdn.rs_newSup->bv_val, p_dn.bv_val, 0 );
op->oq_modrdn.rs_newSup->bv_val, p_dn.bv_val );
op->oq_modrdn.rs_newSup = NULL; /* ignore newSuperior */
}
}
@ -407,7 +405,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": newSup(ndn=%s) not here!\n",
np_ndn->bv_val, 0, 0);
np_ndn->bv_val );
rs->sr_text = "new superior not found";
rs->sr_err = LDAP_NO_SUCH_OBJECT;
goto return_results;
@ -416,7 +414,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": wr to new parent OK np=%p, id=%ld\n",
(void *) np, (long) np->e_id, 0 );
(void *) np, (long) np->e_id );
/* check newSuperior for "children" acl */
rs->sr_err = access_allowed( op, np, children,
@ -431,8 +429,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": no wr to newSup children\n",
0, 0, 0 );
": no wr to newSup children\n" );
rs->sr_text = "no write access to new superior's children";
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
goto return_results;
@ -442,8 +439,7 @@ retry: /* transaction retry */
/* parent is an alias, don't allow add */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": entry is alias\n",
0, 0, 0 );
": entry is alias\n" );
rs->sr_text = "new superior is an alias";
rs->sr_err = LDAP_ALIAS_PROBLEM;
goto return_results;
@ -453,8 +449,7 @@ retry: /* transaction retry */
/* parent is a referral, don't allow add */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": entry is referral\n",
0, 0, 0 );
": entry is referral\n" );
rs->sr_text = "new superior is a referral";
rs->sr_err = LDAP_OTHER;
goto return_results;
@ -483,8 +478,7 @@ retry: /* transaction retry */
rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
Debug( LDAP_DEBUG_TRACE,
"no access to new superior\n",
0, 0, 0 );
"no access to new superior\n" );
rs->sr_text =
"no write access to new superior's children";
goto return_results;
@ -494,8 +488,7 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": wr to new parent's children OK\n",
0, 0, 0 );
": wr to new parent's children OK\n" );
new_parent_dn = np_dn;
}
@ -514,7 +507,7 @@ retry: /* transaction retry */
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": new ndn=%s\n",
new_ndn.bv_val, 0, 0 );
new_ndn.bv_val );
/* Shortcut the search */
nei = neip ? neip : eip;
@ -548,7 +541,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": pre-read failed!\n", 0, 0, 0 );
": pre-read failed!\n" );
if ( op->o_preread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */
@ -564,13 +557,13 @@ retry: /* transaction retry */
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_modrdn)
": txn_begin(2) failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_modrdn) ": txn2 id: %x\n",
lt2->id(lt2), 0, 0 );
lt2->id(lt2) );
/* delete old DN */
rs->sr_err = bdb_dn2id_delete( op, lt2, eip, e );
@ -578,7 +571,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": dn2id del failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -601,7 +594,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": dn2id add failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -622,7 +615,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": modify failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
if ( ( rs->sr_err == LDAP_INSUFFICIENT_ACCESS ) && opinfo.boi_err ) {
rs->sr_err = opinfo.boi_err;
}
@ -641,7 +634,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": id2entry failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
switch( rs->sr_err ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
@ -666,7 +659,7 @@ retry: /* transaction retry */
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_modrdn)
": has_children failed: %s (%d)\n",
db_strerror(rs->sr_err), rs->sr_err, 0 );
db_strerror(rs->sr_err), rs->sr_err );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "internal error";
goto return_results;
@ -693,7 +686,7 @@ retry: /* transaction retry */
{
Debug( LDAP_DEBUG_TRACE,
"<=- " LDAP_XSTRING(bdb_modrdn)
": post-read failed!\n", 0, 0, 0 );
": post-read failed!\n" );
if ( op->o_postread & SLAP_CONTROL_CRITICAL ) {
/* FIXME: is it correct to abort
* operation if control fails? */

9
servers/slapd/back-bdb/monitor.c
View file

@ -272,7 +272,7 @@ bdb_monitor_initialize( void )
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
": unable to add "
"objectIdentifier \"%s=%s\"\n",
s_oid[ i ].name, s_oid[ i ].oid, 0 );
s_oid[ i ].name, s_oid[ i ].oid );
return 2;
}
}
@ -282,7 +282,7 @@ bdb_monitor_initialize( void )
if ( code != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
": register_at failed for attributeType (%s)\n",
s_at[ i ].desc, 0, 0 );
s_at[ i ].desc );
return 3;
} else {
@ -295,7 +295,7 @@ bdb_monitor_initialize( void )
if ( code != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_initialize)
": register_oc failed for objectClass (%s)\n",
s_oc[ i ].desc, 0, 0 );
s_oc[ i ].desc );
return 4;
} else {
@ -358,8 +358,7 @@ bdb_monitor_db_open( BackendDB *be )
if ( warning++ == 0 ) {
Debug( LDAP_DEBUG_ANY, LDAP_XSTRING(bdb_monitor_db_open)
": monitoring disabled; "
"configure monitor database to enable\n",
0, 0, 0 );
"configure monitor database to enable\n" );
}
return 0;

2
servers/slapd/back-bdb/nextid.c
View file

@ -69,7 +69,7 @@ int bdb_last_id( BackendDB *be, DB_TXN *tid )
default:
Debug( LDAP_DEBUG_ANY,
"=> bdb_last_id: get failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
goto done;
}

2
servers/slapd/back-bdb/operational.c
View file

@ -103,7 +103,7 @@ retry:
Debug(LDAP_DEBUG_ARGS,
"<=- " LDAP_XSTRING(bdb_hasSubordinates)
": has_children failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
rc = LDAP_OTHER;
}

2
servers/slapd/back-bdb/referral.c
View file

@ -74,7 +74,7 @@ dn2entry_retry:
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_referrals)
": dn2entry failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
rs->sr_text = "internal error";
return LDAP_OTHER;
}

23
servers/slapd/back-bdb/search.c
View file

@ -365,7 +365,7 @@ bdb_search( Operation *op, SlapReply *rs )
DB_TXN *ltid = NULL;
OpExtra *oex;
Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(bdb_search) "\n", 0, 0, 0);
Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(bdb_search) "\n" );
attrs = op->oq_search.rs_attrs;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
@ -557,8 +557,7 @@ dn2entry_retry:
}
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search) ": entry is referral\n",
0, 0, 0 );
LDAP_XSTRING(bdb_search) ": entry is referral\n" );
rs->sr_matched = matched_dn.bv_val;
send_ldap_result( op, rs );
@ -632,8 +631,7 @@ cand_retry:
if ( candidates[0] == 0 ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search) ": no candidates\n",
0, 0, 0 );
LDAP_XSTRING(bdb_search) ": no candidates\n" );
goto nochange;
}
@ -675,8 +673,7 @@ cand_retry:
if ( id == NOID ) {
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search)
": no paged results candidates\n",
0, 0, 0 );
": no paged results candidates\n" );
send_paged_response( op, rs, &lastid, 0 );
rs->sr_err = LDAP_OTHER;
@ -773,7 +770,7 @@ txnfail:
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search)
": candidate %ld not found\n",
(long) id, 0, 0 );
(long) id );
} else {
/* get the next ID from the DB */
id_retry:
@ -893,7 +890,7 @@ id_retry:
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search)
": %ld scope not okay\n",
(long) id, 0, 0 );
(long) id );
goto loop_continue;
}
@ -1059,7 +1056,7 @@ id_retry:
Debug( LDAP_DEBUG_TRACE,
LDAP_XSTRING(bdb_search)
": %ld does not match filter\n",
(long) id, 0, 0 );
(long) id );
}
loop_continue:
@ -1105,7 +1102,7 @@ static int base_candidate(
ID *ids )
{
Debug(LDAP_DEBUG_ARGS, "base_candidates: base: \"%s\" (0x%08lx)\n",
e->e_nname.bv_val, (long) e->e_id, 0);
e->e_nname.bv_val, (long) e->e_id );
ids[0] = 1;
ids[1] = e->e_id;
@ -1274,7 +1271,7 @@ static int search_candidates(
if( rc ) {
Debug(LDAP_DEBUG_TRACE,
"bdb_search_candidates: failed (rc=%d)\n",
rc, NULL, NULL );
rc );
} else {
Debug(LDAP_DEBUG_TRACE,
@ -1347,7 +1344,7 @@ send_paged_response(
Debug(LDAP_DEBUG_ARGS,
"send_paged_response: lastid=0x%08lx nentries=%d\n",
lastid ? *lastid : 0, rs->sr_nentries, NULL );
lastid ? *lastid : 0, rs->sr_nentries );
ctrls[1] = NULL;

64
servers/slapd/back-bdb/tools.c
View file

@ -533,7 +533,7 @@ static int bdb_tool_next_id(
"next_id failed: %s (%d)",
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
"=> bdb_tool_next_id: %s\n", text->bv_val );
return rc;
}
rc = bdb_dn2id_add( op, tid, ei, e );
@ -542,7 +542,7 @@ static int bdb_tool_next_id(
"dn2id_add failed: %s (%d)",
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> bdb_tool_next_id: %s\n", text->bv_val, 0, 0 );
"=> bdb_tool_next_id: %s\n", text->bv_val );
} else if ( hole ) {
if ( nholes == nhmax - 1 ) {
if ( holes == hbuf ) {
@ -656,7 +656,7 @@ ID bdb_tool_entry_put(
assert( text->bv_val[0] == '\0' ); /* overconservative? */
Debug( LDAP_DEBUG_TRACE, "=> " LDAP_XSTRING(bdb_tool_entry_put)
"( %ld, \"%s\" )\n", (long) e->e_id, e->e_dn, 0 );
"( %ld, \"%s\" )\n", (long) e->e_id, e->e_dn );
bdb = (struct bdb_info *) be->be_private;
@ -669,11 +669,11 @@ ID bdb_tool_entry_put(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
return NOID;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_put) ": txn id: %x\n",
tid->id(tid), 0, 0 );
tid->id(tid) );
}
op.o_hdr = &ohdr;
@ -702,7 +702,7 @@ ID bdb_tool_entry_put(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -714,7 +714,7 @@ ID bdb_tool_entry_put(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -728,7 +728,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
e->e_id = NOID;
}
}
@ -742,7 +742,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_put) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
}
e->e_id = NOID;
}
@ -773,7 +773,7 @@ int bdb_tool_entry_reindex(
Debug( LDAP_DEBUG_ARGS,
"=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld )\n",
(long) id, 0, 0 );
(long) id );
assert( tool_base == NULL );
assert( tool_filter == NULL );
@ -817,7 +817,7 @@ int bdb_tool_entry_reindex(
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_tool_entry_reindex)
": no index configured for %s\n",
adv[i]->ad_cname.bv_val, 0, 0 );
adv[i]->ad_cname.bv_val );
return -1;
}
}
@ -837,7 +837,7 @@ int bdb_tool_entry_reindex(
Debug( LDAP_DEBUG_ANY,
LDAP_XSTRING(bdb_tool_entry_reindex)
": could not locate id=%ld\n",
(long) id, 0, 0 );
(long) id );
return -1;
}
@ -852,11 +852,11 @@ int bdb_tool_entry_reindex(
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_reindex) ": "
"txn_begin failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
goto done;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_reindex) ": txn id: %x\n",
tid->id(tid), 0, 0 );
tid->id(tid) );
}
/*
@ -868,7 +868,7 @@ int bdb_tool_entry_reindex(
Debug( LDAP_DEBUG_TRACE,
"=> " LDAP_XSTRING(bdb_tool_entry_reindex) "( %ld, \"%s\" )\n",
(long) id, e->e_dn, 0 );
(long) id, e->e_dn );
rc = bdb_tool_index_add( &op, tid, e );
@ -880,7 +880,7 @@ done:
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_reindex)
": txn_commit failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
e->e_id = NOID;
}
}
@ -891,7 +891,7 @@ done:
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_reindex)
": txn_aborted! %s (%d)\n",
db_strerror(rc), rc, 0 );
db_strerror(rc), rc );
}
e->e_id = NOID;
}
@ -922,7 +922,7 @@ ID bdb_tool_entry_modify(
Debug( LDAP_DEBUG_TRACE,
"=> " LDAP_XSTRING(bdb_tool_entry_modify) "( %ld, \"%s\" )\n",
(long) e->e_id, e->e_dn, 0 );
(long) e->e_id, e->e_dn );
bdb = (struct bdb_info *) be->be_private;
@ -939,11 +939,11 @@ ID bdb_tool_entry_modify(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
return NOID;
}
Debug( LDAP_DEBUG_TRACE, LDAP_XSTRING(bdb_tool_entry_modify) ": txn id: %x\n",
tid->id(tid), 0, 0 );
tid->id(tid) );
}
op.o_hdr = &ohdr;
@ -959,7 +959,7 @@ ID bdb_tool_entry_modify(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -973,7 +973,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_modify) ": "
"%s\n", text->bv_val, 0, 0 );
"%s\n", text->bv_val );
e->e_id = NOID;
}
}
@ -986,7 +986,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_modify) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
}
e->e_id = NOID;
}
@ -1029,7 +1029,7 @@ int bdb_tool_entry_delete(
Debug( LDAP_DEBUG_TRACE,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) "( %s )\n",
ndn->bv_val, 0, 0 );
ndn->bv_val );
bdb = (struct bdb_info *) be->be_private;
@ -1046,7 +1046,7 @@ int bdb_tool_entry_delete(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
return LDAP_OTHER;
}
rc = bdb->bi_id2entry->bdi_db->cursor(
@ -1067,7 +1067,7 @@ int bdb_tool_entry_delete(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -1091,7 +1091,7 @@ int bdb_tool_entry_delete(
rc = -1;
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(mdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
rc = bdb_dn2id_delete( &op, tid, eip, e );
@ -1101,7 +1101,7 @@ int bdb_tool_entry_delete(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -1112,7 +1112,7 @@ int bdb_tool_entry_delete(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -1123,7 +1123,7 @@ int bdb_tool_entry_delete(
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
goto done;
}
@ -1142,7 +1142,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": "
"%s\n", text->bv_val, 0, 0 );
"%s\n", text->bv_val );
}
}
@ -1154,7 +1154,7 @@ done:
db_strerror(rc), rc );
Debug( LDAP_DEBUG_ANY,
"=> " LDAP_XSTRING(bdb_tool_entry_delete) ": %s\n",
text->bv_val, 0, 0 );
text->bv_val );
}
}

2
servers/slapd/back-bdb/trans.c
View file

@ -48,7 +48,7 @@ bdb_trans_backoff( int num_retries )
delay = 16384 * (key * (double) pow_retries / (double) max_key);
delay = delay ? delay : 1;
Debug( LDAP_DEBUG_TRACE, "delay = %d, num_retries = %d\n", delay, num_retries, 0 );
Debug( LDAP_DEBUG_TRACE, "delay = %d, num_retries = %d\n", delay, num_retries );
timeout.tv_sec = delay / 1000000;
timeout.tv_usec = delay % 1000000;

8
servers/slapd/back-dnssrv/bind.c
View file

@ -37,7 +37,7 @@ dnssrv_back_bind(
{
Debug( LDAP_DEBUG_TRACE, "DNSSRV: bind dn=\"%s\" (%d)\n",
BER_BVISNULL( &op->o_req_dn ) ? "" : op->o_req_dn.bv_val,
op->orb_method, 0 );
op->orb_method );
/* allow rootdn as a means to auth without the need to actually
* contact the proxied DSA */
@ -56,10 +56,10 @@ dnssrv_back_bind(
!BER_BVISEMPTY( &op->orb_cred ) )
{
/* simple bind */
Statslog( LDAP_DEBUG_STATS,
Debug( LDAP_DEBUG_STATS,
"%s DNSSRV BIND dn=\"%s\" provided cleartext passwd\n",
op->o_log_prefix,
BER_BVISNULL( &op->o_req_dn ) ? "" : op->o_req_dn.bv_val , 0, 0, 0 );
BER_BVISNULL( &op->o_req_dn ) ? "" : op->o_req_dn.bv_val );
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"you shouldn't send strangers your password" );
@ -69,7 +69,7 @@ dnssrv_back_bind(
/* NOTE: we're not going to get here anyway:
* unauthenticated bind is dealt with by the frontend */
Debug( LDAP_DEBUG_TRACE, "DNSSRV: BIND dn=\"%s\"\n",
BER_BVISNULL( &op->o_req_dn ) ? "" : op->o_req_dn.bv_val, 0, 0 );
BER_BVISNULL( &op->o_req_dn ) ? "" : op->o_req_dn.bv_val );
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"anonymous bind expected" );

12
servers/slapd/back-dnssrv/referral.c
View file

@ -70,13 +70,13 @@ dnssrv_back_referrals(
}
Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
op->o_req_dn.bv_val, domain, 0 );
op->o_req_dn.bv_val, domain );
i = ldap_domain2hostlist( domain, &hostlist );
if ( i ) {
Debug( LDAP_DEBUG_TRACE,
"DNSSRV: domain2hostlist(%s) returned %d\n",
domain, i, 0 );
domain, i );
rs->sr_text = "no DNS SRV RR available for DN";
rc = LDAP_NO_SUCH_OBJECT;
goto done;
@ -85,7 +85,7 @@ dnssrv_back_referrals(
hosts = ldap_str2charray( hostlist, " " );
if( hosts == NULL ) {
Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charray error\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charray error\n" );
rs->sr_text = "problem processing DNS SRV records for DN";
goto done;
}
@ -106,13 +106,13 @@ dnssrv_back_referrals(
}
}
Statslog( LDAP_DEBUG_STATS,
Debug( LDAP_DEBUG_STATS,
"%s DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
op->o_log_prefix, op->o_protocol,
op->o_req_dn.bv_val, urls[0].bv_val, 0 );
op->o_req_dn.bv_val, urls[0].bv_val );
Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> url=\"%s\"\n",
op->o_req_dn.bv_val, urls[0].bv_val, 0 );
op->o_req_dn.bv_val, urls[0].bv_val );
rs->sr_ref = urls;
send_ldap_error( op, rs, LDAP_REFERRAL,

13
servers/slapd/back-dnssrv/search.c
View file

@ -80,11 +80,11 @@ dnssrv_back_search(
}
Debug( LDAP_DEBUG_TRACE, "DNSSRV: dn=\"%s\" -> domain=\"%s\"\n",
op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", domain, 0 );
op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", domain );
if( ( rc = ldap_domain2hostlist( domain, &hostlist ) ) ) {
Debug( LDAP_DEBUG_TRACE, "DNSSRV: domain2hostlist returned %d\n",
rc, 0, 0 );
rc );
send_ldap_error( op, rs, LDAP_NO_SUCH_OBJECT,
"no DNS SRV RR available for DN" );
goto done;
@ -93,7 +93,7 @@ dnssrv_back_search(
hosts = ldap_str2charray( hostlist, " " );
if( hosts == NULL ) {
Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charray error\n", 0, 0, 0 );
Debug( LDAP_DEBUG_TRACE, "DNSSRV: str2charray error\n" );
send_ldap_error( op, rs, LDAP_OTHER,
"problem processing DNS SRV records for DN" );
goto done;
@ -116,10 +116,10 @@ dnssrv_back_search(
}
}
Statslog( LDAP_DEBUG_STATS,
Debug( LDAP_DEBUG_STATS,
"%s DNSSRV p=%d dn=\"%s\" url=\"%s\"\n",
op->o_log_prefix, op->o_protocol,
op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", urls[0].bv_val, 0 );
op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "", urls[0].bv_val );
Debug( LDAP_DEBUG_TRACE,
"DNSSRV: ManageDSAit scope=%d dn=\"%s\" -> url=\"%s\"\n",
@ -153,8 +153,7 @@ dnssrv_back_search(
Debug( LDAP_DEBUG_TRACE,
"DNSSRV: dn=\"%s\" subordinate to refdn=\"%s\"\n",
op->o_req_dn.bv_len ? op->o_req_dn.bv_val : "",
refdn == NULL ? "" : refdn,
NULL );
refdn == NULL ? "" : refdn );
rs->sr_matched = refdn;
rs->sr_err = LDAP_NO_SUCH_OBJECT;

4
servers/slapd/back-ldap/add.c
View file

@ -52,7 +52,7 @@ ldap_back_add(
rs->sr_err = LDAP_SUCCESS;
Debug( LDAP_DEBUG_ARGS, "==> ldap_back_add(\"%s\")\n",
op->o_req_dn.bv_val, 0, 0 );
op->o_req_dn.bv_val );
if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
lc = NULL;
@ -132,7 +132,7 @@ cleanup:
}
Debug( LDAP_DEBUG_ARGS, "<== ldap_back_add(\"%s\"): %d\n",
op->o_req_dn.bv_val, rs->sr_err, 0 );
op->o_req_dn.bv_val, rs->sr_err );
return rs->sr_err;
}

24
servers/slapd/back-ldap/bind.c
View file

@ -348,7 +348,7 @@ retry_lock:;
assert( !LDAP_BACK_PCONN_ISPRIV( lc ) );
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_bind: destroying conn %lu (refcnt=%u)\n",
lc->lc_conn->c_connid, lc->lc_refcnt, 0 );
lc->lc_conn->c_connid, lc->lc_refcnt );
if ( tmplc->lc_refcnt != 0 ) {
/* taint it */
@ -1104,7 +1104,7 @@ retry_lock:
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: %s: %s\n",
op->o_log_prefix, buf, 0 );
op->o_log_prefix, buf );
}
if ( !LDAP_BACK_PCONN_ISPRIV( lc ) ) {
@ -1172,7 +1172,7 @@ retry_lock:
(void *)lc, refcnt,
expiring ? " expiring" : "" );
Debug( LDAP_DEBUG_TRACE,
"=>ldap_back_getconn: %s.\n", buf, 0, 0 );
"=>ldap_back_getconn: %s.\n", buf );
}
}
@ -1229,7 +1229,7 @@ ldap_back_quarantine(
Debug( LDAP_DEBUG_ANY,
"%s: ldap_back_quarantine enter.\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
ri->ri_idx = 0;
ri->ri_count = 0;
@ -1406,7 +1406,7 @@ retry_lock:;
LDAP_BACK_DONTSEND, &binddn, &bindcred );
if ( rc != 1 ) {
Debug( LDAP_DEBUG_ANY, "Error: ldap_back_is_proxy_authz "
"returned %d, misconfigured URI?\n", rc, 0, 0 );
"returned %d, misconfigured URI?\n", rc );
rs->sr_err = LDAP_OTHER;
rs->sr_text = "misconfigured URI?";
LDAP_BACK_CONN_ISBOUND_CLEAR( lc );
@ -1438,7 +1438,7 @@ retry_lock:;
if ( rc != LDAP_OPT_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "Error: ldap_set_option "
"(SECPROPS,\"%s\") failed!\n",
sb->sb_secprops, 0, 0 );
sb->sb_secprops );
goto done;
}
}
@ -1506,7 +1506,7 @@ retry:;
tmp_dn = "";
if ( !BER_BVISNULL( &lc->lc_bound_ndn ) && !BER_BVISEMPTY( &lc->lc_bound_ndn ) ) {
Debug( LDAP_DEBUG_ANY, "%s ldap_back_dobind_int: DN=\"%s\" without creds, binding anonymously",
op->o_log_prefix, lc->lc_bound_ndn.bv_val, 0 );
op->o_log_prefix, lc->lc_bound_ndn.bv_val );
}
} else {
@ -1872,7 +1872,7 @@ retry:;
"%s ldap_back_op_result: "
"got referrals with err=%d\n",
op->o_log_prefix,
rs->sr_err, 0 );
rs->sr_err );
} else {
int i;
@ -1893,7 +1893,7 @@ retry:;
"got err=%d with null "
"or empty referrals\n",
op->o_log_prefix,
rs->sr_err, 0 );
rs->sr_err );
rs->sr_err = LDAP_NO_SUCH_OBJECT;
}
@ -2058,7 +2058,7 @@ ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_
} else {
Debug( LDAP_DEBUG_TRACE,
"ldap_back_retry: conn %p refcnt=%u unable to retry.\n",
(void *)(*lcp), (*lcp)->lc_refcnt, 0 );
(void *)(*lcp), (*lcp)->lc_refcnt );
LDAP_BACK_CONN_TAINTED_SET( *lcp );
ldap_back_release_conn_lock( li, lcp, 0 );
@ -2373,7 +2373,7 @@ ldap_back_proxy_authz_bind(
ctrlsp, NULL );
if ( ctrl ) {
Debug( LDAP_DEBUG_TRACE, "%s: ldap_back_proxy_authz_bind: authzID=\"%s\" (authzid)\n",
op->o_log_prefix, ctrl->ldctl_value.bv_val, 0 );
op->o_log_prefix, ctrl->ldctl_value.bv_val );
if ( ctrl->ldctl_value.bv_len > STRLENOF("dn:") &&
strncasecmp( ctrl->ldctl_value.bv_val, "dn:", STRLENOF("dn:") ) == 0 )
{
@ -2392,7 +2392,7 @@ ldap_back_proxy_authz_bind(
rc = ldap_whoami_s( lc->lc_ld, &val, NULL, NULL );
if ( rc == LDAP_SUCCESS && val != NULL ) {
Debug( LDAP_DEBUG_TRACE, "%s: ldap_back_proxy_authz_bind: authzID=\"%s\" (whoami)\n",
op->o_log_prefix, val->bv_val, 0 );
op->o_log_prefix, val->bv_val );
if ( val->bv_len > STRLENOF("dn:") &&
strncasecmp( val->bv_val, "dn:", STRLENOF("dn:") ) == 0 )
{

44
servers/slapd/back-ldap/chain.c
View file

@ -454,7 +454,7 @@ Document: RFC 4511
rc = ldap_url_parse_ext( ref->bv_val, &srv, LDAP_PVT_URL_PARSE_NONE );
if ( rc != LDAP_URL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s ldap_chain_op: unable to parse ref=\"%s\"\n",
op->o_log_prefix, ref->bv_val, 0 );
op->o_log_prefix, ref->bv_val );
/* try next */
rc = LDAP_OTHER;
@ -533,7 +533,7 @@ Document: RFC 4511
if ( li.li_uri == NULL ) {
Debug( LDAP_DEBUG_TRACE, "%s ldap_chain_op: ref=\"%s\" unable to reconstruct URI\n",
op->o_log_prefix, ref->bv_val, 0 );
op->o_log_prefix, ref->bv_val );
/* try next */
rc = LDAP_OTHER;
@ -726,7 +726,7 @@ ldap_chain_search(
rc = ldap_url_parse_ext( ref[0].bv_val, &srv, LDAP_PVT_URL_PARSE_NONE );
if ( rc != LDAP_URL_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "%s ldap_chain_search: unable to parse ref=\"%s\"\n",
op->o_log_prefix, ref->bv_val, 0 );
op->o_log_prefix, ref->bv_val );
/* try next */
rs->sr_err = LDAP_OTHER;
@ -808,7 +808,7 @@ ldap_chain_search(
if ( rc != LDAP_SUCCESS || li.li_uri == NULL ) {
Debug( LDAP_DEBUG_TRACE, "%s ldap_chain_search: ref=\"%s\" unable to reconstruct URI\n",
op->o_log_prefix, ref->bv_val, 0 );
op->o_log_prefix, ref->bv_val );
/* try next */
rc = LDAP_OTHER;
@ -1128,7 +1128,7 @@ ldap_chain_response( Operation *op, SlapReply *rs )
Debug( LDAP_DEBUG_ANY,
"%s: ldap_chain_response: "
"overlay should have sent result.\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
}
break;
@ -1339,7 +1339,7 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
Debug( LDAP_DEBUG_ANY, "slapd-chain: "
"subsequent underlying database \"%s\" "
"must contain attribute \"%s\".\n",
e->e_name.bv_val, ad->ad_cname.bv_val, 0 );
e->e_name.bv_val, ad->ad_cname.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
}
@ -1358,7 +1358,7 @@ chain_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
fail:
Debug( LDAP_DEBUG_ANY, "slapd-chain: "
"unable to init %sunderlying database \"%s\".\n",
lc->lc_common_li == NULL ? "common " : "", e->e_name.bv_val, 0 );
lc->lc_common_li == NULL ? "common " : "", e->e_name.bv_val );
return LDAP_CONSTRAINT_VIOLATION;
}
@ -1372,7 +1372,7 @@ fail:
{
Debug( LDAP_DEBUG_ANY, "slapd-chain: "
"database \"%s\" insert failed.\n",
e->e_name.bv_val, 0, 0 );
e->e_name.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
}
@ -1460,12 +1460,12 @@ chain_lddel( CfEntryInfo *ce, Operation *op )
if ( li != lc->lc_common_li ) {
if (! avl_delete( &lc->lc_lai.lai_tree, li, ldap_chain_uri_cmp ) ) {
Debug( LDAP_DEBUG_ANY, "slapd-chain: avl_delete failed. "
"\"%s\" not found.\n", li->li_uri, 0, 0 );
"\"%s\" not found.\n", li->li_uri );
return -1;
}
} else if ( lc->lc_lai.lai_tree ) {
Debug( LDAP_DEBUG_ANY, "slapd-chain: cannot delete first underlying "
"LDAP database when other databases are still present.\n", 0, 0, 0 );
"LDAP database when other databases are still present.\n" );
return -1;
} else {
lc->lc_common_li = NULL;
@ -1602,7 +1602,7 @@ chain_cf_gen( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: "
"illegal <resolve> value %s "
"in \"chain-chaining>\".\n",
c->log, argv[ 0 ], 0 );
c->log, argv[ 0 ] );
return 1;
}
@ -1612,7 +1612,7 @@ chain_cf_gen( ConfigArgs *c )
Debug( LDAP_DEBUG_ANY, "%s: "
"illegal <continuation> value %s "
"in \"chain-chaining\".\n",
c->log, argv[ 0 ], 0 );
c->log, argv[ 0 ] );
return 1;
}
@ -1622,7 +1622,7 @@ chain_cf_gen( ConfigArgs *c )
} else {
Debug( LDAP_DEBUG_ANY, "%s: "
"unknown option in \"chain-chaining\".\n",
c->log, 0, 0 );
c->log );
return 1;
}
}
@ -1642,7 +1642,7 @@ chain_cf_gen( ConfigArgs *c )
ber_free( ber, 1 );
Debug( LDAP_DEBUG_ANY, "%s: "
"chaining behavior control encoding error!\n",
c->log, 0, 0 );
c->log );
return 1;
}
@ -1652,7 +1652,7 @@ chain_cf_gen( ConfigArgs *c )
ber_free( ber, 1 );
Debug( LDAP_DEBUG_ANY, "%s: "
"chaining behavior control encoding error!\n",
c->log, 0, 0 );
c->log );
return 1;
}
}
@ -1662,7 +1662,7 @@ chain_cf_gen( ConfigArgs *c )
ber_free( ber, 1 );
Debug( LDAP_DEBUG_ANY, "%s: "
"chaining behavior control encoding error!\n",
c->log, 0, 0 );
c->log );
return 1;
}
@ -1694,7 +1694,7 @@ chain_cf_gen( ConfigArgs *c )
#else /* ! LDAP_CONTROL_X_CHAINING_BEHAVIOR */
Debug( LDAP_DEBUG_ANY, "%s: "
"\"chaining\" control unsupported (ignored).\n",
c->log, 0, 0 );
c->log );
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */
} break;
@ -1712,7 +1712,7 @@ chain_cf_gen( ConfigArgs *c )
"<%s> invalid max referral depth %d",
c->argv[0], c->value_int );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n",
c->log, c->cr_msg, 0 );
c->log, c->cr_msg );
rc = 1;
break;
}
@ -1827,7 +1827,7 @@ ldap_chain_db_config(
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"underlying slapd-ldap initialization failed.\n.",
fname, lineno, 0 );
fname, lineno );
return 1;
}
lc->lc_cfg_li = db.be_private;
@ -1862,7 +1862,7 @@ private_destroy:;
{
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"no URI list allowed in slapo-chain.\n",
fname, lineno, 0 );
fname, lineno );
rc = 1;
goto private_destroy;
}
@ -1873,7 +1873,7 @@ private_destroy:;
{
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"duplicate URI in slapo-chain.\n",
fname, lineno, 0 );
fname, lineno );
rc = 1;
goto private_destroy;
}
@ -2306,7 +2306,7 @@ chain_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-chain: "
"unable to register chaining behavior control: %d.\n",
rc, 0, 0 );
rc );
return rc;
}
#endif /* LDAP_CONTROL_X_CHAINING_BEHAVIOR */

80
servers/slapd/back-ldap/config.c
View file

@ -719,7 +719,7 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <authz>\": "
"\"%s\" conflicts with existing authz rules",
c->argv[ 0 ], c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -731,7 +731,7 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s <authz>\": "
"\"<authz>\" conflicts with \"*\"", c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -741,7 +741,7 @@ slap_idassert_authzfrom_parse( ConfigArgs *c, slap_idassert_t *si )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s <authz>\": "
"invalid syntax", c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -788,7 +788,7 @@ slap_idassert_passthru_parse( ConfigArgs *c, slap_idassert_t *si )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s <authz>\": "
"invalid syntax", c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -838,7 +838,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"unknown mode \"%s\"",
c->argv[0], argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -853,7 +853,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"authz=\"native\" incompatible "
"with auth method", c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
si->si_flags |= LDAP_BACK_AUTH_NATIVE_AUTHZ;
@ -866,7 +866,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"unknown authz \"%s\"",
c->argv[0], argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -880,7 +880,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"unable to parse flags \"%s\"",
c->argv[0], argvi );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -902,7 +902,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"obsolete-proxy-authz\" flag "
"incompatible with previously issued \"obsolete-encoding-workaround\" flag.",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
err = 1;
break;
@ -917,7 +917,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"obsolete-encoding-workaround\" flag "
"incompatible with previously issued \"obsolete-proxy-authz\" flag.",
c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
err = 1;
break;
@ -947,7 +947,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"unknown flag \"%s\"",
c->argv[0], flags[ j ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
err = 1;
break;
}
@ -963,7 +963,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
"\"%s <args>\": "
"unable to parse field \"%s\"",
c->argv[0], c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -975,7 +975,7 @@ slap_idassert_parse( ConfigArgs *c, slap_idassert_t *si )
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"%s <args>\": "
"SIMPLE needs \"binddn\" and \"credentials\"", c->argv[0] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -1708,7 +1708,7 @@ ldap_back_cf_gen( ConfigArgs *c )
"unable to parse uri \"%s\" "
"in \"uri <uri>\" line: %s",
c->value_string, why );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
urlrc = 1;
goto done_url;
}
@ -1730,7 +1730,7 @@ ldap_back_cf_gen( ConfigArgs *c )
"in \"uri <uri>\" statement "
"for uri #%d of \"%s\"",
i, c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
}
}
@ -1764,7 +1764,7 @@ ldap_back_cf_gen( ConfigArgs *c )
"in \"uri <uri>\" statement "
"for \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
urlrc = 1;
goto done_url;
}
@ -1824,7 +1824,7 @@ done_url:;
"\"acl-authcDN <DN>\" incompatible "
"with auth method %d",
li->li_acl_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
if ( !BER_BVISNULL( &li->li_acl_authcDN ) ) {
@ -1850,7 +1850,7 @@ done_url:;
"\"acl-passwd <cred>\" incompatible "
"with auth method %d",
li->li_acl_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
if ( !BER_BVISNULL( &li->li_acl_passwd ) ) {
@ -1927,7 +1927,7 @@ done_url:;
"%s: line %d: \"obsolete-proxy-authz\" flag "
"in \"idassert-mode <args>\" "
"incompatible with previously issued \"obsolete-encoding-workaround\" flag.\n",
c->fname, c->lineno, 0 );
c->fname, c->lineno );
return 1;
}
li->li_idassert_flags |= LDAP_BACK_AUTH_OBSOLETE_PROXY_AUTHZ;
@ -1938,7 +1938,7 @@ done_url:;
"%s: line %d: \"obsolete-encoding-workaround\" flag "
"in \"idassert-mode <args>\" "
"incompatible with previously issued \"obsolete-proxy-authz\" flag.\n",
c->fname, c->lineno, 0 );
c->fname, c->lineno );
return 1;
}
li->li_idassert_flags |= LDAP_BACK_AUTH_OBSOLETE_ENCODING_WORKAROUND;
@ -1969,7 +1969,7 @@ done_url:;
"\"idassert-authcDN <DN>\" incompatible "
"with auth method %d",
li->li_idassert_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
if ( !BER_BVISNULL( &li->li_idassert_authcDN ) ) {
@ -1995,7 +1995,7 @@ done_url:;
"\"idassert-passwd <cred>\" incompatible "
"with auth method %d",
li->li_idassert_authmethod );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
if ( !BER_BVISNULL( &li->li_idassert_passwd ) ) {
@ -2017,7 +2017,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"\"idassert-method <args>\": "
"no longer supported; use \"idassert-bind\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
case LDAP_BACK_CFG_IDASSERT_BIND:
@ -2063,7 +2063,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need URI to discover absolute filters support "
"in \"t-f-support discover\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2105,7 +2105,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2120,7 +2120,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse timeout \"%s\"",
c->argv[ i ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
}
@ -2133,7 +2133,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse idle timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
li->li_idle_timeout = (time_t)t;
@ -2146,7 +2146,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse conn ttl\"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
li->li_conn_ttl = (time_t)t;
@ -2159,7 +2159,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg),
"unable to parse network timeout \"%s\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
li->li_network_timeout = (time_t)t;
@ -2171,7 +2171,7 @@ done_url:;
"unsupported version \"%s\" "
"in \"protocol-version <version>\"",
c->argv[ 1 ] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2208,7 +2208,7 @@ done_url:;
c->argv[ 1 ],
LDAP_BACK_CONN_PRIV_MIN,
LDAP_BACK_CONN_PRIV_MAX );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
li->li_conn_priv_max = c->value_int;
@ -2235,7 +2235,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"need URI to discover \"cancel\" support "
"in \"cancel exop-discover\"" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
@ -2260,13 +2260,13 @@ done_url:;
if ( LDAP_BACK_QUARANTINE( li ) ) {
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"quarantine already defined" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
rc = slap_retry_info_parse( c->argv[1], &li->li_quarantine,
c->cr_msg, sizeof( c->cr_msg ) );
if ( rc ) {
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
} else {
ldap_pvt_thread_mutex_init( &li->li_quarantine_mutex );
@ -2313,7 +2313,7 @@ done_url:;
snprintf( c->cr_msg, sizeof( c->cr_msg ),
"%s unknown argument \"%s\"",
c->argv[0], c->argv[1] );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
}
li->li_flags &= ~LDAP_BACK_F_ONERR_STOP;
@ -2326,7 +2326,7 @@ done_url:;
"to the \"rwm\" overlay; see slapo-rwm(5) "
"for details (hint: add \"overlay rwm\" "
"and prefix all directives with \"rwm-\")" );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg, 0 );
Debug( LDAP_DEBUG_ANY, "%s: %s.\n", c->log, c->cr_msg );
return 1;
case LDAP_BACK_CFG_OMIT_UNKNOWN_SCHEMA:
@ -2377,7 +2377,7 @@ ldap_back_init_cf( BackendInfo *bi )
Debug( LDAP_DEBUG_ANY, "config_back_initialize: "
"warning, unable to get \"olcDbACLPasswd\" "
"attribute description: %d: %s\n",
rc, text, 0 );
rc, text );
} else {
(void)ldif_must_b64_encode_register( ad->ad_cname.bv_val,
ad->ad_type->sat_oid );
@ -2389,7 +2389,7 @@ ldap_back_init_cf( BackendInfo *bi )
Debug( LDAP_DEBUG_ANY, "config_back_initialize: "
"warning, unable to get \"olcDbIDAssertPasswd\" "
"attribute description: %d: %s\n",
rc, text, 0 );
rc, text );
} else {
(void)ldif_must_b64_encode_register( ad->ad_cname.bv_val,
ad->ad_type->sat_oid );
@ -2432,8 +2432,8 @@ ldap_back_exop_whoami(
return rs->sr_err = LDAP_PROTOCOL_ERROR;
}
Statslog( LDAP_DEBUG_STATS, "%s WHOAMI\n",
op->o_log_prefix, 0, 0, 0, 0 );
Debug( LDAP_DEBUG_STATS, "%s WHOAMI\n",
op->o_log_prefix );
rs->sr_err = backend_check_restrictions( op, rs,
(struct berval *)&slap_EXOP_WHOAMI );

24
servers/slapd/back-ldap/distproc.c
View file

@ -400,7 +400,7 @@ distproc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"first underlying database \"%s\" "
"cannot contain attribute \"%s\".\n",
e->e_name.bv_val, ad->ad_cname.bv_val, 0 );
e->e_name.bv_val, ad->ad_cname.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
@ -410,7 +410,7 @@ distproc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"subsequent underlying database \"%s\" "
"must contain attribute \"%s\".\n",
e->e_name.bv_val, ad->ad_cname.bv_val, 0 );
e->e_name.bv_val, ad->ad_cname.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
}
@ -425,7 +425,7 @@ distproc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"unable to init %sunderlying database \"%s\".\n",
lc->lc_common_li == NULL ? "common " : "", e->e_name.bv_val, 0 );
lc->lc_common_li == NULL ? "common " : "", e->e_name.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
}
@ -440,7 +440,7 @@ distproc_ldadd( CfEntryInfo *p, Entry *e, ConfigArgs *ca )
{
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"database \"%s\" insert failed.\n",
e->e_name.bv_val, 0, 0 );
e->e_name.bv_val );
rc = LDAP_CONSTRAINT_VIOLATION;
goto done;
}
@ -628,7 +628,7 @@ ldap_distproc_db_config(
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"underlying slapd-ldap initialization failed.\n.",
fname, lineno, 0 );
fname, lineno );
return 1;
}
lc->lc_cfg_li = be->be_private;
@ -670,7 +670,7 @@ private_destroy:;
{
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"no URI list allowed in slapo-distproc.\n",
fname, lineno, 0 );
fname, lineno );
rc = 1;
goto private_destroy;
}
@ -681,7 +681,7 @@ private_destroy:;
{
Debug( LDAP_DEBUG_ANY, "%s: line %d: "
"duplicate URI in slapo-distproc.\n",
fname, lineno, 0 );
fname, lineno );
rc = 1;
goto private_destroy;
}
@ -928,8 +928,8 @@ ldap_exop_chained_request(
Operation *op,
SlapReply *rs )
{
Statslog( LDAP_DEBUG_STATS, "%s CHAINED REQUEST\n",
op->o_log_prefix, 0, 0, 0, 0 );
Debug( LDAP_DEBUG_STATS, "%s CHAINED REQUEST\n",
op->o_log_prefix );
rs->sr_err = backend_check_restrictions( op, rs,
(struct berval *)&slap_EXOP_CHAINEDREQUEST );
@ -958,7 +958,7 @@ distproc_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"unable to register chainedRequest exop: %d.\n",
rc, 0, 0 );
rc );
return rc;
}
@ -966,7 +966,7 @@ distproc_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"unable to register canChainOperations supported feature: %d.\n",
rc, 0, 0 );
rc );
return rc;
}
@ -976,7 +976,7 @@ distproc_initialize( void )
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "slapd-distproc: "
"unable to register returnContinuationReference control: %d.\n",
rc, 0, 0 );
rc );
return rc;
}

4
servers/slapd/back-ldap/extended.c
View file

@ -183,7 +183,7 @@ ldap_back_exop_passwd(
isproxy = ber_bvcmp( &ndn, &op->o_ndn );
Debug( LDAP_DEBUG_ARGS, "==> ldap_back_exop_passwd(\"%s\")%s\n",
dn.bv_val, isproxy ? " (proxy)" : "", 0 );
dn.bv_val, isproxy ? " (proxy)" : "" );
retry:
rc = ldap_passwd( lc->lc_ld, &dn,
@ -313,7 +313,7 @@ ldap_back_exop_generic(
char *text = NULL;
Debug( LDAP_DEBUG_ARGS, "==> ldap_back_exop_generic(%s, \"%s\")\n",
op->ore_reqoid.bv_val, op->o_req_dn.bv_val, 0 );
op->ore_reqoid.bv_val, op->o_req_dn.bv_val );
assert( lc != NULL );
assert( rs->sr_ctrls == NULL );

2
servers/slapd/back-ldap/init.c
View file

@ -209,7 +209,7 @@ ldap_back_db_open( BackendDB *be, ConfigReply *cr )
Debug( LDAP_DEBUG_TRACE,
"ldap_back_db_open: URI=%s\n",
li->li_uri != NULL ? li->li_uri : "", 0, 0 );
li->li_uri != NULL ? li->li_uri : "" );
/* by default, use proxyAuthz control on each operation */
switch ( li->li_idassert_mode ) {

31
servers/slapd/back-ldap/monitor.c
View file

@ -598,7 +598,7 @@ ldap_back_monitor_conn_init(
"ldap_back_monitor_conn_init: "
"unable to create entry \"%s,%s\"\n",
li->li_monitor_info.lmi_conn_rdn.bv_val,
ms->mss_ndn.bv_val, 0 );
ms->mss_ndn.bv_val );
return( -1 );
}
@ -627,8 +627,7 @@ ldap_back_monitor_conn_init(
if ( rc != LDAP_URL_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_db_open: "
"unable to parse URI list (ignored)\n",
0, 0, 0 );
"unable to parse URI list (ignored)\n" );
} else {
Attribute *a2 = attr_alloc( slap_schema.si_ad_labeledURI );
@ -755,7 +754,7 @@ ldap_back_monitor_ops_init(
"ldap_back_monitor_ops_init: "
"unable to create entry \"%s,%s\"\n",
li->li_monitor_info.lmi_ops_rdn.bv_val,
ms->mss_ndn.bv_val, 0 );
ms->mss_ndn.bv_val );
return( -1 );
}
@ -768,7 +767,7 @@ ldap_back_monitor_ops_init(
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_ops_init: "
"unable to register entry \"%s\" for monitoring\n",
parent->e_name.bv_val, 0, 0 );
parent->e_name.bv_val );
goto done;
}
@ -785,7 +784,7 @@ ldap_back_monitor_ops_init(
"ldap_back_monitor_ops_init: "
"unable to create entry \"%s,%s\"\n",
ldap_back_monitor_op[op].rdn.bv_val,
parent->e_nname.bv_val, 0 );
parent->e_nname.bv_val );
return( -1 );
}
@ -818,7 +817,7 @@ ldap_back_monitor_ops_init(
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_ops_init: "
"unable to register entry \"%s\" for monitoring\n",
e->e_name.bv_val, 0, 0 );
e->e_name.bv_val );
ch_free( cb );
break;
}
@ -869,7 +868,7 @@ ldap_back_monitor_initialize( void )
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_initialize: unable to add "
"objectIdentifier \"%s=%s\"\n",
s_oid[ i ].name, s_oid[ i ].oid, 0 );
s_oid[ i ].name, s_oid[ i ].oid );
return 2;
}
}
@ -879,7 +878,7 @@ ldap_back_monitor_initialize( void )
if ( code != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_initialize: register_at failed for attributeType (%s)\n",
s_at[ i ].desc, 0, 0 );
s_at[ i ].desc );
return 3;
} else {
@ -892,7 +891,7 @@ ldap_back_monitor_initialize( void )
if ( code != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_initialize: register_oc failed for objectClass (%s)\n",
s_oc[ i ].desc, 0, 0 );
s_oc[ i ].desc );
return 4;
} else {
@ -905,7 +904,7 @@ ldap_back_monitor_initialize( void )
if ( ! *s_moc[i].oc ) {
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_initialize: failed to find objectClass (%s)\n",
s_moc[ i ].name, 0, 0 );
s_moc[ i ].name );
return 5;
}
@ -965,8 +964,7 @@ ldap_back_monitor_db_open( BackendDB *be )
if ( warning++ == 0 ) {
Debug( LDAP_DEBUG_ANY, "ldap_back_monitor_db_open: "
"monitoring disabled; "
"configure monitor database to enable\n",
0, 0, 0 );
"configure monitor database to enable\n" );
}
return 0;
@ -978,8 +976,7 @@ ldap_back_monitor_db_open( BackendDB *be )
rc = mbe->register_database( be, &li->li_monitor_info.lmi_ndn );
if ( rc != 0 ) {
Debug( LDAP_DEBUG_ANY, "ldap_back_monitor_db_open: "
"failed to register the database with back-monitor\n",
0, 0, 0 );
"failed to register the database with back-monitor\n" );
}
}
if ( BER_BVISNULL( &li->li_monitor_info.lmi_conn_rdn ) ) {
@ -1003,7 +1000,7 @@ ldap_back_monitor_db_open( BackendDB *be )
{
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_db_open: "
"failed to register connection subsystem", 0, 0, 0 );
"failed to register connection subsystem" );
return -1;
}
@ -1018,7 +1015,7 @@ ldap_back_monitor_db_open( BackendDB *be )
{
Debug( LDAP_DEBUG_ANY,
"ldap_back_monitor_db_open: "
"failed to register operation subsystem", 0, 0, 0 );
"failed to register operation subsystem" );
return -1;
}

10
servers/slapd/back-ldap/search.c
View file

@ -72,7 +72,7 @@ ldap_back_munge_filter(
int gotit = 0;
Debug( LDAP_DEBUG_ARGS, "=> ldap_back_munge_filter \"%s\"\n",
filter->bv_val, 0, 0 );
filter->bv_val );
for ( ptr = strchr( filter->bv_val, '(' );
ptr;
@ -135,7 +135,7 @@ ldap_back_munge_filter(
}
Debug( LDAP_DEBUG_ARGS, "<= ldap_back_munge_filter \"%s\" (%d)\n",
filter->bv_val, gotit, 0 );
filter->bv_val, gotit );
return gotit;
}
@ -453,7 +453,7 @@ retry:
"%s ldap_back_search: "
"got SEARCH_REFERENCE "
"with no referrals\n",
op->o_log_prefix, 0, 0 );
op->o_log_prefix );
}
/* cleanup */
@ -526,7 +526,7 @@ retry:
"%s ldap_back_search: "
"got referrals with err=%d\n",
op->o_log_prefix,
rs->sr_err, 0 );
rs->sr_err );
} else {
int cnt;
@ -550,7 +550,7 @@ retry:
"got err=%d with null "
"or empty referrals\n",
op->o_log_prefix,
rs->sr_err, 0 );
rs->sr_err );
rs->sr_err = LDAP_NO_SUCH_OBJECT;
}

Some files were not shown because too many files have changed in this diff Show more