Changeset 769

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

Location:

trunk/guitools

Files:

• evfsgui/evfsgui.vrp (modified) (2 diffs)
• evfsgui/evfsgui.vrx (modified) (6 diffs)
• evfsgui/evfsgui.vry (modified) ( previous)
• shared/smbtree.vrs (modified) (7 diffs)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -8 +8 @@
 RunParameters: 
 RunDirectory: U:\Develop\Samba\trunk\guitools\evfsgui
-VRXWindow: __VREMainWindow,1,1951,2361,891,7841
+VRXWindow: __VREMainWindow,1,1951,2361,1012,7841
 VRXWindow: __VREFileListWindow,1,2192,7950,2665,3358
 VRXWindow: __VRESectionListWindow,1,1156,12382,12238,6914
@@ -16 +16 @@
 UserWindow: Main,1
 UserWindow: SW_SMBTREE,1
+UserWindow: SW_DIALOG,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1090 +1090 @@
             if datatype(T1) = "NUM" & datatype(T2) = "NUM" & datatype(T3) = "NUM" & datatype(T4) = "NUM" then do
                 FoundName = 0
-                /* Don't add a local link IP to LMHosts - workaround only */
+                /* Don't add localhost and local link IP to LMHosts */
+                if T1 = '127' & T2 = '0' & T3 = '0' & T4 = '1' then iterate
                 if T1 = '169' & T2 = '254' then iterate
                 do J = 1 to lmname.0 /* machine already in LMHosts? */
@@ -1258 +1259 @@
         parse var resdata p_mpoint resource rwFlag
         if options.!debug == 1 then do
-            say '  'cnt' resdata  ="'resdata'"'
+            say '  Connection 'cnt', resdata  ="'resdata'"'
         end
 
@@ -1635 +1636 @@
 
     if pos("4OS2", value("COMSPEC",,"OS2ENVIRONMENT")) = 1
-        then UserCred = '--user='Credentials.!username'%'Credentials.!password
-        else UserCred = '--user='Credentials.!username'%%'Credentials.!password
-
-    if options.!storecreds = 1 & \(UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '-N') then do
+        then UserCred = '--user='Credentials.!username'%%'Credentials.!password
+        else UserCred = '--user='Credentials.!username'%'Credentials.!password
+
+    if options.!storecreds = 1 & \(UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' | UserCred = '--user=%%' | UserCred = '-N') then do
         ok = _ucSetUc()
         ok = VRSet("Pict_PWINMEM","PicturePath","#36")
@@ -1793 +1794 @@
 
     if options.!debug == 1 then do
-        say '  data     = "'data'"'
-        say '  p_node   = "'p_node'"'
-        say '  p_mounts = "'p_mounts'"'
-        say '  p_string = "'p_string'"'
+        say '  data        = "'data'"'
+        say '  p_node      = "'p_node'"'
+        say '  p_mounts    = "'p_mounts'"'
+        say '  p_string    = "'p_string'"'
     end
 
@@ -1845 +1846 @@
     p_workgroup = strip(p_workgroup,'T',':')
 
-say "p_workgroup = "p_workgroup
-say "p_server    = "p_server
-say "p_share     = "p_share
+    if options.!debug == 1 then do
+        say '  p_workgroup = "'p_workgroup'"'
+        say '  p_server    = "'p_server'"'
+        say '  p_share     = "'p_share'"'
+    end
 
     p_server = translate(p_server)
@@ -2343 +2346 @@
     if options.!debug == 1 then say time()' EF_SERVER_Change started'
     Now = VRGet("EF_SERVER","value")
-say now' 'LastServer
+
     if Now = "" | Now = LastServer then return
     ok = SysSleep(2)

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 = ''