[SCM] Samba Shared Repository - branch master updated

[Anatoliy Atanasov]

The branch, master has been updated
       via  788bfc8 s4/fsmo: Change return type from NTSTATUS to WERROR for drepl_takeFSMOrole
      from  0ad2277 s4/fsmo: Fix callback declaration

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


- Log -----------------------------------------------------------------
commit 788bfc8a25849bccc963a4b948c1e5857f2d885c
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Fri Sep 10 13:44:20 2010 +0300

    s4/fsmo: Change return type from NTSTATUS to WERROR for drepl_takeFSMOrole
    
    This removed an unnecessary conversion of the return type in
    drepl_take_FSMO_role.

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

Summary of changes:
 source4/dsdb/repl/drepl_service.c        |    2 +-
 source4/dsdb/samdb/ldb_modules/rootdse.c |    5 +++--
 source4/librpc/idl/irpc.idl              |    2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 1423827..2c43617 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -347,7 +347,7 @@ static NTSTATUS drepl_take_FSMO_role(struct irpc_message *msg,
 {
 	struct dreplsrv_service *service = talloc_get_type(msg->private_data,
 							   struct dreplsrv_service);
-	r->out.result = werror_to_ntstatus(dreplsrv_fsmo_role_check(service, r->in.role));
+	r->out.result = dreplsrv_fsmo_role_check(service, r->in.role);
 	return NT_STATUS_OK;
 }
 
diff --git a/source4/dsdb/samdb/ldb_modules/rootdse.c b/source4/dsdb/samdb/ldb_modules/rootdse.c
index 3397d60..248a720 100644
--- a/source4/dsdb/samdb/ldb_modules/rootdse.c
+++ b/source4/dsdb/samdb/ldb_modules/rootdse.c
@@ -983,7 +983,8 @@ static int rootdse_become_master(struct ldb_module *module,
 	struct ldb_context *ldb = ldb_module_get_ctx(module);
 	TALLOC_CTX *tmp_ctx = talloc_new(req);
 	struct loadparm_context *lp_ctx = ldb_get_opaque(ldb, "loadparm");
-	NTSTATUS status_call, status_fn;
+	NTSTATUS status_call;
+	WERROR status_fn;
 	struct dcerpc_binding_handle *irpc_handle;
 
 	msg = messaging_client_init(tmp_ctx, lpcfg_messaging_path(tmp_ctx, lp_ctx),
@@ -1002,7 +1003,7 @@ static int rootdse_become_master(struct ldb_module *module,
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	status_fn = r.out.result;
-	if (!NT_STATUS_IS_OK(status_fn)) {
+	if (!W_ERROR_IS_OK(status_fn)) {
 		return LDB_ERR_OPERATIONS_ERROR;
 	}
 	return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);
diff --git a/source4/librpc/idl/irpc.idl b/source4/librpc/idl/irpc.idl
index 2b88dc7..1639d49 100644
--- a/source4/librpc/idl/irpc.idl
+++ b/source4/librpc/idl/irpc.idl
@@ -169,7 +169,7 @@ import "misc.idl", "security.idl", "nbt.idl";
                DREPL_PDC_MASTER
 	} drepl_role_master;
 
-	NTSTATUS drepl_takeFSMORole(
+	WERROR drepl_takeFSMORole(
 		[in] uint32 role
 		);
 


-- 
Samba Shared Repository