Skip to content
GitLab
Commit 97a310b3 authored by Ondřej Kuzník's avatar Ondřej Kuzník
Browse files

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

parent 09cec1f1
Hide whitespace changes
Inline Side-by-side
contrib/slapd-modules/acl/gssacl.c
View file @ 97a310b3
......@@ -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 );
}
contrib/slapd-modules/addpartial/addpartial-overlay.c
View file @ 97a310b3
......@@ -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;
......
contrib/slapd-modules/allowed/allowed.c
View file @ 97a310b3
......@@ -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;
}
}
......
contrib/slapd-modules/authzid/authzid.c
View file @ 97a310b3
......@@ -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;
}
......
contrib/slapd-modules/autogroup/autogroup.c
View file @ 97a310b3
......@@ -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,