From 1917b388734217426ecf14fb041f97060873c8fa Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 18 Jun 2008 14:50:53 +0200 Subject: Fix Bug #5548 (segfauls in handle_include with %m macro expansion). In alloc_sub_basic, when expanding '%m', substitute "" instead of NULL for remote_machine when this is NULL. Else a NULL string is returned. Michael (This used to be commit c65b456c6a145d15b7fd27a2a3440a0709fc3277) --- source3/lib/substitute.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source3') diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 17bcbcac9d..926bb8233d 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -655,7 +655,10 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, a_string = realloc_string_sub(a_string, "%h", myhostname()); break; case 'm' : - a_string = realloc_string_sub(a_string, "%m", remote_machine); + a_string = realloc_string_sub(a_string, "%m", + remote_machine + ? remote_machine + : ""); break; case 'v' : a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING); -- cgit