The branch, master has been updated
via 08a21f3 messaging: fix net command failure due to unhandled return
code
from 45e84dd WHATSNEW: Add Dynamic RPC port range
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 08a21f3539fef76a22189b1751fd2a081937a057
Author: David Mulder via samba-technical <[email protected]>
Date: Wed Jun 7 06:43:07 2017 -0600
messaging: fix net command failure due to unhandled return code
messaging_init_internal() blanket returned NT_STATUS_INTERNAL_ERROR
instead of correctly changing the return code to an NTSTATUS code. Also
return more appropriate mem error.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12828
Signed-off-by: David Mulder <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Reviewed-by: David Disseldorp <[email protected]>
Autobuild-User(master): David Disseldorp <[email protected]>
Autobuild-Date(master): Thu Jun 8 08:04:05 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/lib/messages.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index d7ad49d..e0ef1f8 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -303,7 +303,7 @@ static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
&ret);
if (ctx->msg_dgm_ref == NULL) {
DEBUG(2, ("messaging_dgm_ref failed: %s\n", strerror(ret)));
- status = NT_STATUS_INTERNAL_ERROR;
+ status = map_nt_error_from_unix(ret);
goto done;
}
talloc_set_destructor(ctx, messaging_context_destructor);
@@ -314,7 +314,7 @@ static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
if (ret != 0) {
DEBUG(2, ("messaging_ctdbd_init failed: %s\n",
strerror(ret)));
- status = NT_STATUS_INTERNAL_ERROR;
+ status = map_nt_error_from_unix(ret);
goto done;
}
}
@@ -327,7 +327,7 @@ static NTSTATUS messaging_init_internal(TALLOC_CTX *mem_ctx,
TDB_INCOMPATIBLE_HASH|TDB_CLEAR_IF_FIRST);
if (ctx->names_db == NULL) {
DBG_DEBUG("server_id_db_init failed\n");
- status = NT_STATUS_INTERNAL_ERROR;
+ status = NT_STATUS_NO_MEMORY;
goto done;
}
--
Samba Shared Repository
