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

Timestamp:

Aug 17, 2013, 11:55:30 AM (12 years ago)

Author:

Herwig Bauernfeind

Message:

EVFSGUI 2.5: Browsing enhancements

File:

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

trunk/guitools/shared/smbtree.vrs

@@ -7 +7 @@
     if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Refreshing network")
     ok = SysFileDelete(samba.!msg)
+    parse var debuglevel .'='level
+    if level = 0 then debuglevel = ' --debuglevel=1'
 
     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
@@ -20 +22 @@
     say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'UserCred' 'debuglevel' >'samba.!serverlist
+
+    if level = 0 then debuglevel = ' --debuglevel=0'
 
     /* strip username from caption */
@@ -137 +141 @@
                 end
                 if ThrowMsg = 1 then do
+                call beep 2400, 500
                     ThrowMsg = 0
                     Msg.Type = "W"
@@ -253 +258 @@
         if stat = "READY:" then do /* we found a readable output file */
             OneWorkGroupOnly = 0
+            GuestRetry = 0
             
             Machine = substr(smbmachine.I,pos('.',smbmachine.I)+1)
+            if right(Machine,4) = '$rt$' then do
+                Machine = left(Machine, length(Machine) - 4)
+                GuestRetry = 1
+            end
+
 
             smbtree.!machine = _GetMachinehandle(Machine)
@@ -289 +300 @@
                 ok = stream(smbmachine.I,'c','close')
                 ok = SysFileDelete(smbmachine.I)
+                /* Try with guest account once */
+
+                if GuestRetry = 0 & UserCred <> '-N' then do
+                    say       '  detach 'samba.!smbclientexe' -L "'machine'" -N 'debuglevel' 2>'smbmachine.I'$rt$ 1>&2'
+                    address cmd 'detach 'samba.!smbclientexe' -L "'machine'" -N 'debuglevel' 2>'smbmachine.I'$rt$ 1>&2'
+                end
+
                 iterate
             end