Author: jerry Date: 2005-04-11 03:39:32 +0000 (Mon, 11 Apr 2005) New Revision: 6292
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6292 Log: svn merge -r6290:6291 SAMBA_3_0 Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt branches/SAMBA_3_0_RELEASE/source/client/client.c Changeset: Modified: branches/SAMBA_3_0_RELEASE/WHATSNEW.txt =================================================================== --- branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-04-11 03:34:27 UTC (rev 6291) +++ branches/SAMBA_3_0_RELEASE/WHATSNEW.txt 2005-04-11 03:39:32 UTC (rev 6292) @@ -49,6 +49,9 @@ * Revert change to FindFirst() server code that broke WinXP SP2 clients from launching *.exe files from a dfs target share. + * BUG 2588: Force smbclient to send netbios messages to port + 139 unless otherwise instructed (based on patch from Thomas + Bork). o Volker Lendecke <[EMAIL PROTECTED]> Modified: branches/SAMBA_3_0_RELEASE/source/client/client.c =================================================================== --- branches/SAMBA_3_0_RELEASE/source/client/client.c 2005-04-11 03:34:27 UTC (rev 6291) +++ branches/SAMBA_3_0_RELEASE/source/client/client.c 2005-04-11 03:39:32 UTC (rev 6292) @@ -3229,6 +3229,7 @@ struct nmb_name called, calling; fstring server_name; char name_type_hex[10]; + int msg_port; make_nmb_name(&calling, calling_name, 0x0); make_nmb_name(&called , desthost, name_type); @@ -3241,7 +3242,11 @@ if (have_ip) ip = dest_ip; - if (!(cli=cli_initialise(NULL)) || (cli_set_port(cli, port) != port) || + /* we can only do messages over port 139 (to windows clients at least) */ + + msg_port = port ? port : 139; + + if (!(cli=cli_initialise(NULL)) || (cli_set_port(cli, msg_port) != msg_port) || !cli_connect(cli, server_name, &ip)) { d_printf("Connection to %s failed\n", desthost); return 1;
