summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2005-04-19 14:03:08 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:56:39 -0500
commit67e9fb7c7c61a337da7efb887e401dfaa828b7b5 (patch)
tree8b785e12b3a0f7d2cc43208825098745ce40666a /source3
parentfecdaec41c70916dc8e591c6e98e830c0f5cb0b1 (diff)
downloadsamba-67e9fb7c7c61a337da7efb887e401dfaa828b7b5.tar.gz
samba-67e9fb7c7c61a337da7efb887e401dfaa828b7b5.tar.bz2
samba-67e9fb7c7c61a337da7efb887e401dfaa828b7b5.zip
r6388: BUG 2626: ensure that the calling_name is set to something after parsing smb.conf (if not set via -n)
(This used to be commit 97c68ec1e86c1de44fa1ab6e5a9d7f58b2843a34)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/client.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index be17488919..9cb0d15a68 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3472,6 +3472,8 @@ static int do_message_op(void)
if ( strlen(calling_name) != 0 )
set_global_myname( calling_name );
+ else
+ pstrcpy( calling_name, global_myname() );
if(poptPeekArg(pc)) {
pstrcpy(service,poptGetArg(pc));