3 files changed, 10 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 9763664940..563abf672a 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -1060,7 +1060,13 @@ static int partition_extended_schema_update_now(struct ldb_module *module, struc
 	}
 
 	/* fire the first one */
-	return partition_call_first(ac);
+	ret =  partition_call_first(ac);
+
+	if (ret != LDB_SUCCESS){
+		return ret;
+	}
+
+	return ldb_request_done(req, ret);
 }
 
 
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 29c4f5958f..7080fb632f 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -455,7 +455,7 @@ static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
 	}
 	
 	talloc_free(ext_res);
-	return ret;
+	return ldb_request_done(req, ret);
 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_rootdse_module_ops = {
diff --git a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
index b1d8711cfa..1b8f786c35 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_fsmo.c
@@ -297,6 +297,8 @@ static int schema_fsmo_extended(struct ldb_module *module, struct ldb_request *r
 		return ret;
 	}
 
+	dsdb_make_schema_global(ldb);
+
 	talloc_free(mem_ctx);
 	return LDB_SUCCESS;
 }