Changeset 784 for trunk/guitools/shared/smbtree.vrs

Timestamp:

Aug 8, 2013, 9:56:12 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: Changes in order to work around % issue

File:

• trunk/guitools/shared/smbtree.vrs (modified) (7 diffs)

trunk/guitools/shared/smbtree.vrs

@@ -15 +15 @@
     samba.!serverlist = TempDir'smbtree.srvlst'
 
-    /* smbtree -S = List workgroups (domains) and servers of tree */
+    /* smbtree -b = Use broadcast instead of using the master browser
+       smbtree -D = List only domains (workgroups) of tree
+       smbtree -S = List domains(workgroups) and servers of */
     say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
@@ -118 +120 @@
                 say '  Possible workgroup: "'smbtreeline.sl'"'
                 /* check for eventual error messages */
-                if pos("RECEIVING",translate(smbtreeline.sl)) > 0 | pos("TDB(",translate(smbtreeline.sl)) > 0 then do
+                if pos("RECEIVING",translate(smbtreeline.sl)) > 0 | pos("NT_STATUS",translate(smbtreeline.sl)) > 0 then do
                     Msg.Type = "W"
                     Msg.Text = smbtreeline.sl
@@ -168 +170 @@
     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
 
+    /* We have to remove the double % for smbclient.exe - not entirely clear why */
+    OldUserCred = ""
+    if pos('%%',UserCred) > 0 & pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 0  then do
+        OldUserCred = UserCred
+        parse var UserCred '--user='username'%%'password
+        UserCred = '--user='username'%'password
+        say "  Strip double %%!!!"
+    end
+
     say       '  detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
-    
     address cmd 'detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
 
@@ -176 +186 @@
         parse var UserCred '--user='username'%'.
         ok = VRSet("CN_SMBTREE","Caption","User context: "username)
+    end
+    
+    if OldUserCred <> "" then do
+        UserCred = OldUserCred
+        OldUserCred = ""
+        say "  Restore double %%!!!"
     end
     
@@ -420 +436 @@
 
     call VRSet VRWindow(), 'Pointer', 'Wait'
-    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -D 'debuglevel' 'UserCred' >'samba.!msg
-    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -D 'debuglevel' 'UserCred' >'samba.!msg
+    
+    /* smbtree -b = Use broadcast instead of using the master browser
+       smbtree -D = List only domains (workgroups) of tree
+       smbtree -S = List domains(workgroups) and servers of */
+    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -D 'UserCred' 'debuglevel' >'samba.!msg
+    address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -D 'UserCred' 'debuglevel' >'samba.!msg
 
     if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Enumerating workgroups")
@@ -598 +618 @@
         stemcount = stemcount + 1
         inline = linein(msgfile)
-        if pos('creating lame',inline) > 0 then do
+        if pos('creating lame',inline) > 0 | pos('tdb(',inline) > 0 then do
             stemcount = stemcount - 1
             iterate
@@ -608 +628 @@
     interpret dyn
     ok = stream(msgfile,'c','close')
-    if delMsgFile <> "NODEL" then ok = SysFileDelete(msgfile)
+    /* if delMsgFile <> "NODEL" then ok = SysFileDelete(msgfile) */
+    
     drop msgfile msgstem
     say time()' file2stem() done'