[PATCH] net command fails due to unhandled return code

Jeremy Allison jra at samba.org
Wed Jun 7 16:21:36 UTC 2017


On Wed, Jun 07, 2017 at 06:43:07AM -0600, David Mulder via samba-technical wrote:
> 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.

LGTM. Can I get a second Team reviewer ?

Thanks,

Jeremy.

> Signed-off-by: David Mulder <dmulder at 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
> 
> 



More information about the samba-technical mailing list