sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4/fsmo: Change return type from NTSTATUS to WERROR for drepl_takeFSMOrole

Browse Source 
This removed an unnecessary conversion of the return type in
drepl_take_FSMO_role.
This commit is contained in:
Anatoliy Atanasov 2010-09-10 13:44:20 +03:00
parent 0ad22777ec
commit 788bfc8a25
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/dsdb/repl/drepl_service.c
View File

@ -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 *service = talloc_get_type(msg->private_data,
struct dreplsrv_service); 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; return NT_STATUS_OK;
} }

5
source4/dsdb/samdb/ldb_modules/rootdse.c
View File

@ -983,7 +983,8 @@ static int rootdse_become_master(struct ldb_module *module,
struct ldb_context *ldb = ldb_module_get_ctx(module); struct ldb_context *ldb = ldb_module_get_ctx(module);
TALLOC_CTX *tmp_ctx = talloc_new(req); TALLOC_CTX *tmp_ctx = talloc_new(req);
struct loadparm_context *lp_ctx = ldb_get_opaque(ldb, "loadparm"); 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; struct dcerpc_binding_handle *irpc_handle;
msg = messaging_client_init(tmp_ctx, lpcfg_messaging_path(tmp_ctx, lp_ctx), 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; return LDB_ERR_OPERATIONS_ERROR;
} }
status_fn = r.out.result; 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_ERR_OPERATIONS_ERROR;
} }
return ldb_module_done(req, NULL, NULL, LDB_SUCCESS); return ldb_module_done(req, NULL, NULL, LDB_SUCCESS);

2
source4/librpc/idl/irpc.idl
View File

@ -169,7 +169,7 @@ import "misc.idl", "security.idl", "nbt.idl";
DREPL_PDC_MASTER DREPL_PDC_MASTER
} drepl_role_master; } drepl_role_master;
NTSTATUS drepl_takeFSMORole( WERROR drepl_takeFSMORole(
[in] uint32 role [in] uint32 role
); );