Added code to the handling of the -M option to ensure that we default to

port 139 for that option.  The NetBIOS Messenger Service doesn't run on
a non-NBT port.
(This used to be commit 02986f3e3a8b0411f7cfbfe11015602fe685a440)

diff --git a/source3/client/client.c b/source3/client/client.c
index feb9e07d169c10cbd7302f7a29d40ebad85db400..44fcdb0e8de7462a2a2aa2e62b3cea61b125db25 100644 (file)
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -2839,11 +2839,17 @@ static void remember_query_host(const char *arg,
                        pstrcpy(new_name_resolve_order, optarg);
                        break;
                case 'M':
-                       name_type = 0x03; /* messages are sent to NetBIOS name type 0x3 */
+                       /* Messages are sent to NetBIOS name type 0x3
+                        * (Messenger Service).  Make sure we default
+                        * to port 139 instead of port 445. srl,crh
+                        */
+                       name_type = 0x03; 
                        pstrcpy(desthost,optarg);
-                       message = True;
-                       break;
-               case 'i':
+                       if( 0 == port )
+                               port = 139;
+                       message = True;
+                       break;
+               case 'i':
                        set_global_scope(optarg);
                        break;
                case 'N':