[PATCH] Fix wrong condition for error string assignment

Swen Schillig swen at vnet.ibm.com
Thu Jan 25 10:06:22 UTC 2018


Hi

Small fix for a false condition check.

Please review.

Cheers Swen.
-------------- next part --------------
From 521e6276924c59e72811086dc2126370e860f560 Mon Sep 17 00:00:00 2001
From: Swen Schillig <swen at vnet.ibm.com>
Date: Thu, 25 Jan 2018 11:02:15 +0100
Subject: [PATCH] Fix wrong condition for error string assignment

Signed-off-by: Swen Schillig <swen at vnet.ibm.com>
---
 source4/libnet/libnet_join.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c
index 0c206444a53..afb34252370 100644
--- a/source4/libnet/libnet_join.c
+++ b/source4/libnet/libnet_join.c
@@ -929,7 +929,7 @@ NTSTATUS libnet_Join_member(struct libnet_context *ctx,
 	uint32_t acct_type = 0;
 	const char *account_name;
 	const char *netbios_name;
-	const char *error_string;
+	const char *error_string = NULL;
 
 	r->out.error_string = NULL;
 
@@ -1000,7 +1000,7 @@ NTSTATUS libnet_Join_member(struct libnet_context *ctx,
 	
 	status = provision_store_self_join(ctx, ctx->lp_ctx, ctx->event_ctx, set_secrets, &error_string);
 	if (!NT_STATUS_IS_OK(status)) {
-		if (r->out.error_string) {
+		if (error_string) {
 			r->out.error_string = talloc_steal(mem_ctx, error_string);
 		} else {
 			r->out.error_string
-- 
2.14.3



More information about the samba-technical mailing list