[SCM] Samba Shared Repository - branch master updated

[Kamen Mazdrashki]

The branch, master has been updated
       via  839fe07 s4-drepl: Reference current Schema cache into working_schema context
       via  b4476d5 s4-drepl: Fix log message to be shown on its own line
      from  16d6da8 Move checks inside file_set_sparse() to allow it to be called from anywhere.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 839fe073594c68d1317828ab4087fd52dc801ad2
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Dec 17 22:26:03 2010 +0200

    s4-drepl: Reference current Schema cache into working_schema context
    
    working_schema is a shallow copy of current schema and thus
    depends on part of it. So we want it to be around as long as
    working_schema is used.
    
    Autobuild-User: Kamen Mazdrashki <kamenim at samba.org>
    Autobuild-Date: Fri Dec 17 23:34:29 CET 2010 on sn-devel-104

commit b4476d5f7d434de2936346bedcac932f5294eeb0
Author: Kamen Mazdrashki <kamenim at samba.org>
Date:   Fri Dec 17 22:12:30 2010 +0200

    s4-drepl: Fix log message to be shown on its own line

-----------------------------------------------------------------------

Summary of changes:
 source4/dsdb/repl/drepl_out_helpers.c  |    2 +-
 source4/dsdb/repl/replicated_objects.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/drepl_out_helpers.c b/source4/dsdb/repl/drepl_out_helpers.c
index 6bb2516..c46134e 100644
--- a/source4/dsdb/repl/drepl_out_helpers.c
+++ b/source4/dsdb/repl/drepl_out_helpers.c
@@ -602,7 +602,7 @@ static void dreplsrv_op_pull_source_apply_changes_trigger(struct tevent_req *req
 						       &drsuapi->gensec_skey,
 						       state, &working_schema);
 		if (!W_ERROR_IS_OK(status)) {
-			DEBUG(0,("Failed to create working schema: %s",
+			DEBUG(0,("Failed to create working schema: %s\n",
 				 win_errstr(status)));
 			tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
 			return;
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index f3b6356..d01d3c1 100644
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -476,7 +476,7 @@ WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb,
 	 */
 	if (working_schema) {
 		/* store current schema so we can fall back in case of failure */
-		cur_schema = dsdb_get_schema(ldb, objects);
+		cur_schema = dsdb_get_schema(ldb, working_schema);
 
 		ret = dsdb_reference_schema(ldb, working_schema, false);
 		if (ret != LDB_SUCCESS) {


-- 
Samba Shared Repository