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

Timestamp:

Apr 9, 2013, 6:16:40 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.5 remove double % in user credential string for now, some polishing

File:

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

trunk/guitools/shared/smbtree.vrs

@@ -8 +8 @@
     ok = SysFileDelete(samba.!msg)
 
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
     if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
@@ -51 +51 @@
     end
 
-    if UserCred = 'USERCRED' | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if UserCred = 'USERCRED' | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
     if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
@@ -166 +166 @@
     end
 
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
 
     say       '  detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
-    call lineout "y:\debugger", '  detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
+    
     address cmd 'detach 'samba.!smbclientexe' -L "'machine'" 'UserCred' 'debuglevel' 2>'smbmachine' 1>&2'
 
@@ -212 +212 @@
     end
 
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
     if ShowHidden = 'SHOWHIDDEN' | ShowHidden = '' then ShowHidden = 0
 
@@ -219 +219 @@
         if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", VRGet("DT_STATUSBAR","Caption")||'.')
         stat = stream(smbmachine.I,'c','open read')
-        say '"'stat'"'
+        say '  Try to open "'smbmachine.I'" for reading: "'stat'"'
         if stat = "READY:" & smbmachine.0 = 1 then do /* We just found out we are processing the last machine */
             ok = VRSet("TM_RefreshTreeDisplay","Delay", 1000)
@@ -249 +249 @@
                 line = linein(smbmachine.I)
             end
-            say '  Answer "'line'"'
+            say '  Message "'line'"'
             ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
 
@@ -416 +416 @@
 _RefreshWorkgroups:
     say time()' _RefreshWorkgroups() started'
-    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'
+    if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' then UserCred = '-N'
     if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''