diff options
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 12 | ||||
| -rw-r--r-- | source3/client/clientutil.c | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index b0e4f4a004..6bd94be756 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -33,7 +33,7 @@ pstring cur_dir = "\\"; pstring cd_path = ""; pstring service=""; pstring desthost=""; -pstring myname = ""; +extern pstring myname; pstring password = ""; pstring username=""; pstring workgroup=WORKGROUP; @@ -3988,11 +3988,10 @@ static BOOL open_sockets(int port ) strcpy(desthost,host); } - if (*myname == 0) - { + if (*myname == 0) { get_myname(myname,NULL); - strupper(myname); - } + } + strupper(myname); DEBUG(3,("Opening sockets\n")); @@ -4008,7 +4007,8 @@ static BOOL open_sockets(int port ) /* Try and resolve the name with the netbios server */ int bcast; - if ((bcast = open_socket_in(SOCK_DGRAM, 0, 3)) != -1) { + if ((bcast = open_socket_in(SOCK_DGRAM, 0, 3, + interpret_addr(lp_socket_address()))) != -1) { set_socket_options(bcast, "SO_BROADCAST"); if (name_query(bcast, host, 0x20, True, True, *iface_bcast(dest_ip), diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c index 41c482196a..e684d42612 100644 --- a/source3/client/clientutil.c +++ b/source3/client/clientutil.c @@ -31,7 +31,7 @@ pstring service=""; pstring desthost=""; -pstring myname = ""; +extern pstring myname; pstring password = ""; pstring username=""; pstring workgroup=WORKGROUP; @@ -819,10 +819,8 @@ BOOL cli_open_sockets(int port) DEBUG(5,("Opening sockets\n")); if (*myname == 0) - { - get_myname(myname,NULL); - strupper(myname); - } + get_myname(myname,NULL); + strupper(myname); if (!have_ip) { |