s3: lib: Now remote_machine is static, we can depend on it being non-NULL.
authorJeremy Allison <jra@samba.org>
Thu, 6 Feb 2020 21:36:41 +0000 (13:36 -0800)
committerJeremy Allison <jra@samba.org>
Fri, 7 Feb 2020 18:26:15 +0000 (18:26 +0000)
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

source3/lib/substitute.c

index f49e983ba7c1d2adb8970fd7e5979d094cee18e5..833af10b6f03faebbc4a64b357e8a6729f59b62a 100644 (file)
@@ -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());