svn commit: samba r11547 - in branches/SAMBA_4_0/source/wrepl_server: .

[metze at samba.org]

Author: metze
Date: 2005-11-07 13:22:51 +0000 (Mon, 07 Nov 2005)
New Revision: 11547

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11547

Log:
- don't do pull replication when pullIntervall is 0
- don't do push replication when pushChangeCount is 0

metze
Modified:
   branches/SAMBA_4_0/source/wrepl_server/wrepl_out_connection.c
   branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
   branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h


Changeset:
Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_out_connection.c
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_out_connection.c	2005-11-07 11:44:08 UTC (rev 11546)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_out_connection.c	2005-11-07 13:22:51 UTC (rev 11547)
@@ -236,12 +236,12 @@
 	struct wreplsrv_partner *cur;
 
 	for (cur = service->partners; cur; cur = cur->next) {
-		if (cur->type & WINSREPL_PARTNER_PULL) {
+		if ((cur->type & WINSREPL_PARTNER_PULL) && cur->pull.interval) {
 			cur->pull.te = event_add_timed(service->task->event_ctx, cur,
 						       timeval_zero(), wreplsrv_pull_handler_te, cur);
 			NT_STATUS_HAVE_NO_MEMORY(cur->pull.te);
 		}
-		if (cur->type & WINSREPL_PARTNER_PUSH) {
+		if ((cur->type & WINSREPL_PARTNER_PUSH) && cur->push.change_count) {
 			cur->push.te = event_add_timed(service->task->event_ctx, cur,
 						       timeval_zero(), wreplsrv_push_handler_te, cur);
 			NT_STATUS_HAVE_NO_MEMORY(cur->push.te);

Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c	2005-11-07 11:44:08 UTC (rev 11546)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.c	2005-11-07 13:22:51 UTC (rev 11547)
@@ -84,14 +84,17 @@
 		if (partner == NULL) goto failed;
 		partner->service	= service;
 
-		partner->address	= ldb_msg_find_string(res[i], "address", NULL);
+		partner->address		= ldb_msg_find_string(res[i], "address", NULL);
 		if (!partner->address) goto failed;
-		partner->name		= ldb_msg_find_string(res[i], "name", partner->address);
-		partner->type		= ldb_msg_find_int(res[i], "type", WINSREPL_PARTNER_BOTH);
-		partner->pull.interval	= ldb_msg_find_int(res[i], "pullInterval", WINSREPL_DEFAULT_PULL_INTERVAL);
-		partner->pull.retry_interval = ldb_msg_find_int(res[i], "pullRetryInterval",
-								WINSREPL_DEFAULT_PULL_RETRY_INTERVAL);
-		partner->our_address	= ldb_msg_find_string(res[i], "ourAddress", NULL);
+		partner->name			= ldb_msg_find_string(res[i], "name", partner->address);
+		partner->type			= ldb_msg_find_uint(res[i], "type", WINSREPL_PARTNER_BOTH);
+		partner->pull.interval		= ldb_msg_find_uint(res[i], "pullInterval",
+						   WINSREPL_DEFAULT_PULL_INTERVAL);
+		partner->pull.retry_interval	= ldb_msg_find_uint(res[i], "pullRetryInterval",
+								   WINSREPL_DEFAULT_PULL_RETRY_INTERVAL);
+		partner->our_address		= ldb_msg_find_string(res[i], "ourAddress", NULL);
+		partner->push.change_count	= ldb_msg_find_uint(res[i], "pushChangeCount",
+								   WINSREPL_DEFAULT_PUSH_CHANGE_COUNT);
 
 		talloc_steal(partner, partner->address);
 		talloc_steal(partner, partner->name);

Modified: branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h
===================================================================
--- branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h	2005-11-07 11:44:08 UTC (rev 11546)
+++ branches/SAMBA_4_0/source/wrepl_server/wrepl_server.h	2005-11-07 13:22:51 UTC (rev 11547)
@@ -125,6 +125,8 @@
 #define WINSREPL_DEFAULT_PULL_INTERVAL (30*60)
 #define WINSREPL_DEFAULT_PULL_RETRY_INTERVAL (30)
 
+#define WINSREPL_DEFAULT_PUSH_CHANGE_COUNT (0)
+
 /*
  this represents one of our configured partners
 */