- syncrepl uses LDAP URL only

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
 			{

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
 			{

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
 			{

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
 			{

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
 		{

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;