Attachment 13263 Details for Bug 12828 – patch fix

[patch] patch fix

0001-net-command-fails-due-to-unhandled-return-code.patch (text/plain), 1.59 KB, created by David Mulder on 2017-06-07 12:45:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Mulder

Created: 2017-06-07 12:45:44 UTC

Size: 1.59 KB

patch

obsolete

>From 8c5b9a021284c489ca321b3818dce4c54d68d9e0 Mon Sep 17 00:00:00 2001
>From: David Mulder <dmulder@suse.com>
>Date: Wed, 7 Jun 2017 06:33:26 -0600
>Subject: [PATCH] net command fails due to unhandled return code
>
>messaging_init_internal() blanket returned NT_STATUS_INTERNAL_ERROR instead of correctly changing the ret
>urn code to an NTSTATUS code. Also return more appropriate mem error.
>
>Signed-off-by: David Mulder <dmulder@suse.com>
>---
> source3/lib/messages.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/lib/messages.c b/source3/lib/messages.c
>index d7ad49d7c30..e0ef1f88461 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;
> 	}
> 
>-- 
>2.12.3
>

Actions: View

Attachments on bug 12828: 13262 | 13263 | 13264