mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
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 c65b456c6a
)
This commit is contained in:
parent
aedce263a8
commit
1917b38873
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user