- syncrepl uses LDAP URL only

diff --git a/servers/slapd/add.c b/servers/slapd/add.c
index d63b92c49df76435400d9bf12c50ed36b4b8af61..2a4651abf50c63b02394aa263edbb9bc76fac006 100644 (file)
--- 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 6f39f82e7158163512e48431155fae2ca456beb6..4f983d0c99ce1d53e7393fbe3bcb672035325e97 100644 (file)
--- 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 1405ca9c7201c0d5aca34333748160195efa7ff7..e5d3e7ba07bd7ed660f4030719a9041129a75b3e 100644 (file)
--- 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 3f542adb4b81e1ed9a561a6fb8470bab5692fe7e..8e216dd3c2bf618d5015a327b0fec097aa8bbe7b 100644 (file)
--- 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 b10bbe4b331820d24bc762198a4cba11e109509f..ef1382a6d3c330b7dc20e038b5efa1292318dc25 100644 (file)
--- 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 eff86b407358d092ac02702b3e48fc8aa4b4a0ee..2708e9cb6f4837e0779acea21a18234495b7eb43 100644 (file)
--- 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;