[SCM] Samba Shared Repository - branch v4-6-test updated

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  c08e056 messaging: fix net command failure due to unhandled return code
      from  ad1f953 shadow_copy_get_shadow_copy_data: fix GCC snprintf warning

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit c08e05675f056b1a47b2d2cdb0f5ce0b0aed663b
Author: David Mulder via samba-technical <samba-technical at lists.samba.org>
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 <dmulder at suse.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: David Disseldorp <ddiss at samba.org>
    
    Autobuild-User(master): David Disseldorp <ddiss at samba.org>
    Autobuild-Date(master): Thu Jun  8 08:04:05 CEST 2017 on sn-devel-144
    
    (cherry picked from commit 08a21f3539fef76a22189b1751fd2a081937a057)
    
    Autobuild-User(v4-6-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-6-test): Mon Jun 12 12:59:41 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 533e869..69dfbf3 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -302,7 +302,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);
@@ -313,7 +313,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;
 		}
 	}
@@ -326,7 +326,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