From: Jeremy Allison <jra@samba.org>
Date: Thu, 6 Feb 2020 21:36:41 +0000 (-0800)
Subject: s3: lib: Now remote_machine is static, we can depend on it being non-NULL.
X-Git-Tag: ldb-2.1.1~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=859a86b37ea0740e21d763049351f55a9aa93343;p=thirdparty%2Fsamba.git

s3: lib: Now remote_machine is static, we can depend on it being non-NULL.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Feb  7 18:26:15 UTC 2020 on sn-devel-184
---

diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index f49e983ba7c..833af10b6f0 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -532,9 +532,7 @@ char *talloc_sub_basic(TALLOC_CTX *mem_ctx,
 			break;
 		case 'm' :
 			a_string = realloc_string_sub(a_string, "%m",
-						      remote_machine
-						      ? remote_machine
-						      : "");
+						      remote_machine);
 			break;
 		case 'v' :
 			a_string = realloc_string_sub(a_string, "%v", samba_version_string());