From 86196e11a0e61ee6d1cfd1649135de2a429247bf Mon Sep 17 00:00:00 2001 From: Jong Hyuk Choi Date: Mon, 23 Jun 2003 14:15:28 +0000 Subject: [PATCH] - syncrepl uses LDAP URL only --- servers/slapd/add.c | 2 +- servers/slapd/delete.c | 2 +- servers/slapd/modify.c | 2 +- servers/slapd/modrdn.c | 2 +- servers/slapd/passwd.c | 2 +- servers/slapd/slap.h | 5 +---- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/servers/slapd/add.c b/servers/slapd/add.c index d63b92c49d..2a4651abf5 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -328,7 +328,7 @@ do_add( Operation *op, SlapReply *rs ) #ifdef LDAP_SYNCREPL if ( op->o_bd->syncinfo ) { - defref = op->o_bd->syncinfo->master_bv; + defref = op->o_bd->syncinfo->masteruri; } else #endif { diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c index 6f39f82e71..4f983d0c99 100644 --- a/servers/slapd/delete.c +++ b/servers/slapd/delete.c @@ -211,7 +211,7 @@ do_delete( BerVarray defref = NULL; #ifdef LDAP_SYNCREPL if ( op->o_bd->syncinfo ) { - defref = op->o_bd->syncinfo->master_bv; + defref = op->o_bd->syncinfo->masteruri; } else #endif { diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c index 1405ca9c72..e5d3e7ba07 100644 --- a/servers/slapd/modify.c +++ b/servers/slapd/modify.c @@ -448,7 +448,7 @@ do_modify( BerVarray defref = NULL; #ifdef LDAP_SYNCREPL if ( op->o_bd->syncinfo ) { - defref = op->o_bd->syncinfo->master_bv; + defref = op->o_bd->syncinfo->masteruri; } else #endif { diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c index 3f542adb4b..8e216dd3c2 100644 --- a/servers/slapd/modrdn.c +++ b/servers/slapd/modrdn.c @@ -375,7 +375,7 @@ do_modrdn( BerVarray defref = NULL; #ifdef LDAP_SYNCREPL if ( op->o_bd->syncinfo ) { - defref = op->o_bd->syncinfo->master_bv; + defref = op->o_bd->syncinfo->masteruri; } else #endif { diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c index b10bbe4b33..ef1382a6d3 100644 --- a/servers/slapd/passwd.c +++ b/servers/slapd/passwd.c @@ -59,7 +59,7 @@ int passwd_extop( BerVarray defref = NULL; #ifdef LDAP_SYNCREPL if ( op->o_bd->syncinfo ) { - defref = op->o_bd->syncinfo->master_bv; + defref = op->o_bd->syncinfo->masteruri; } else #endif { diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index eff86b4073..2708e9cb6f 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1299,9 +1299,6 @@ typedef struct syncinfo_s { void *ctx; int id; char *masteruri; - struct berval *master_bv; - char *mastername; - int masterport; int type; struct berval updatedn; char *binddn; @@ -1318,7 +1315,7 @@ typedef struct syncinfo_s { int scope; int deref; int slimit; - int tlimit; + int tlimit; Filter *filter; char *filterstr; char **attrs; -- 2.39.5