3 files changed, 8 insertions, 6 deletions
diff --git a/source4/dsdb/repl/drepl_partitions.c b/source4/dsdb/repl/drepl_partitions.c
index f36b735d32..88c4bbf065 100644
--- a/source4/dsdb/repl/drepl_partitions.c
+++ b/source4/dsdb/repl/drepl_partitions.c
@@ -33,8 +33,6 @@
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 #include "param/param.h"
 
-static WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s);
-
 WERROR dreplsrv_load_partitions(struct dreplsrv_service *s)
 {
 	WERROR status;
@@ -256,7 +254,7 @@ static WERROR dreplsrv_refresh_partition(struct dreplsrv_service *s,
 	return WERR_OK;
 }
 
-static WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s)
+WERROR dreplsrv_refresh_partitions(struct dreplsrv_service *s)
 {
 	WERROR status;
 	struct dreplsrv_partition *p;
diff --git a/source4/dsdb/repl/drepl_periodic.c b/source4/dsdb/repl/drepl_periodic.c
index b88d2cee1e..36d5f924be 100644
--- a/source4/dsdb/repl/drepl_periodic.c
+++ b/source4/dsdb/repl/drepl_periodic.c
@@ -105,5 +105,8 @@ static void dreplsrv_periodic_run(struct dreplsrv_service *service)
 
 	DEBUG(2,("dreplsrv_periodic_run(): run pending_ops\n"));
 
+	/* the KCC might have changed repsFrom */
+	dreplsrv_refresh_partitions(service);
+
 	dreplsrv_run_pending_ops(service);
 }
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index bb446333e2..fbcde764cc 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -547,9 +547,10 @@ static int replmd_update_rpmd(struct ldb_context *ldb, struct ldb_message *msg,
 
 	our_invocation_id = samdb_ntds_invocation_id(ldb);
 	if (!our_invocation_id) {
-		ldb_debug_set(ldb, LDB_DEBUG_ERROR,
-			      __location__ ": replmd_update_rpmd: unable to find invocationId\n");
-		return LDB_ERR_OPERATIONS_ERROR;
+		/* this happens during an initial vampire while
+		   updating the schema */
+		DEBUG(5,("No invocationID - skipping replPropertyMetaData update\n"));
+		return LDB_SUCCESS;
 	}
 
 	unix_to_nt_time(&now, t);