This commit is contained in:
Hallvard Furuseth 2005-07-31 18:17:13 +00:00
parent d49a477702
commit e404a15082
7 changed files with 9 additions and 9 deletions

View File

@ -746,7 +746,7 @@ ldif_back_bind( Operation *op, SlapReply *rs )
static int ldif_back_search(Operation *op, SlapReply *rs)
{
struct ldif_info *ni = (struct ldif_info *) op->o_bd->be_private;
enumCookie ck = {0};
enumCookie ck = { NULL, NULL, NULL, 0, 0 };
ck.op = op;
ck.rs = rs;

View File

@ -2115,7 +2115,7 @@ replica_unparse( struct slap_replica_info *ri, int i, struct berval *bv )
{
int len;
char *ptr;
struct berval bc = {0};
struct berval bc = BER_BVNULL;
char numbuf[32];
len = sprintf(numbuf, IFMT, i );

View File

@ -204,7 +204,7 @@ fe_op_delete( Operation *op, SlapReply *rs )
{
op->o_delete_glue_parent = 0;
if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
slap_callback cb = { NULL };
slap_callback cb = { NULL, NULL, NULL, NULL };
cb.sc_response = slap_null_cb;
dnParent( &op->o_req_ndn, &pdn );
op->o_req_dn = pdn;

View File

@ -181,7 +181,7 @@ struct option_helper {
const char *oh_usage;
} option_helpers[] = {
{ BER_BVC("slp"), slapd_opt_slp, NULL, "slp[={on|off}] enable/disable SLP" },
{ BER_BVNULL }
{ BER_BVNULL, 0, NULL, NULL }
};
static void

View File

@ -147,7 +147,7 @@ slap_sasl_log(
static const char *slap_propnames[] = {
"*slapConn", "*slapAuthcDN", "*slapAuthzDN", NULL };
static Filter generic_filter = { LDAP_FILTER_PRESENT };
static Filter generic_filter = { LDAP_FILTER_PRESENT, { 0 }, NULL };
static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
#define PROP_CONN 0

View File

@ -535,8 +535,8 @@ do_syncrep2(
int syncstate;
struct berval syncUUID = BER_BVNULL;
struct sync_cookie syncCookie = { 0 };
struct sync_cookie syncCookie_req = { 0 };
struct sync_cookie syncCookie = { BER_BVNULL };
struct sync_cookie syncCookie_req = { BER_BVNULL };
struct berval cookie = BER_BVNULL;
int rc, err, i;
@ -1205,7 +1205,7 @@ syncrepl_entry(
struct berval* syncCSN )
{
Backend *be = op->o_bd;
slap_callback cb = { NULL };
slap_callback cb = { NULL, NULL, NULL, NULL };
struct berval *syncuuid_bv = NULL;
struct berval syncUUID_strrep = BER_BVNULL;
struct berval uuid_bv = BER_BVNULL;

View File

@ -711,7 +711,7 @@ retry:
}
{ /* set version 3 */
int err, version = 3;
int err, version = LDAP_VERSION3;
err = ldap_set_option(ri->ri_ldp,
LDAP_OPT_PROTOCOL_VERSION, &version);