[SCM] Samba Shared Repository - branch master updated

[Andrew Tridgell]

The branch, master has been updated
       via  a4f86c0... s4-ldb: fixed request handling for schemaUpdateNow op
      from  98a3725... Merge branch 'master' of ssh://git.samba.org/data/git/samba

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


- Log -----------------------------------------------------------------
commit a4f86c07e5e98718e5fcde90c70b05a77c41a522
Author: Andrew Tridgell <tridge at samba.org>
Date:   Mon Oct 26 08:38:03 2009 +1100

    s4-ldb: fixed request handling for schemaUpdateNow op

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

Summary of changes:
 source4/dsdb/samdb/ldb_modules/partition.c   |    2 +-
 source4/dsdb/samdb/ldb_modules/rootdse.c     |    2 +-
 source4/dsdb/samdb/ldb_modules/schema_load.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/samdb/ldb_modules/partition.c b/source4/dsdb/samdb/ldb_modules/partition.c
index 64015ed..587d920 100644
--- a/source4/dsdb/samdb/ldb_modules/partition.c
+++ b/source4/dsdb/samdb/ldb_modules/partition.c
@@ -1114,7 +1114,7 @@ static int partition_extended_schema_update_now(struct ldb_module *module, struc
 		return ret;
 	}
 
-	return ldb_request_done(req, ret);
+	return ldb_module_done(req, NULL, NULL, ret);
 }
 
 
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 83e4e3b..5af951a 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -718,7 +718,7 @@ static int rootdse_modify(struct ldb_module *module, struct ldb_request *req)
 	}
 	
 	talloc_free(ext_res);
-	return ldb_request_done(req, ret);
+	return ldb_module_done(req, NULL, NULL, ret);
 }
 
 _PUBLIC_ const struct ldb_module_ops ldb_rootdse_module_ops = {
diff --git a/source4/dsdb/samdb/ldb_modules/schema_load.c b/source4/dsdb/samdb/ldb_modules/schema_load.c
index 62c941d..b695700 100644
--- a/source4/dsdb/samdb/ldb_modules/schema_load.c
+++ b/source4/dsdb/samdb/ldb_modules/schema_load.c
@@ -247,7 +247,7 @@ static int schema_load_extended(struct ldb_module *module, struct ldb_request *r
 	dsdb_make_schema_global(ldb);
 
 	talloc_free(mem_ctx);
-	return LDB_SUCCESS;
+	return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
 }
 
 


-- 
Samba Shared Repository