Changeset 570

Timestamp:

May 19, 2011, 8:37:51 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI 2.1: Fix Ticket #170

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/changes ¶

@@ -11 +11 @@
 - Passive connections/double connection detection does not seem 
   to work properly
+  
+Version 2.1.1 2011-03-08
+- Fixed: Finally servers always end up in the proper domain/workgroup
 
 Version 2.1.0 2011-01-18

branches/guitools-2.0/evfsgui/evfsgui.VRP ¶

@@ -10 +10 @@
 VRXWindow: __VREFileListWindow,1,807,11033,1590,3358
 VRXWindow: __VRESectionListWindow,1,2674,10648,8696,4794
-VRXWindow: __VREToolsWindow,1,2517,7082,6486,1665
+VRXWindow: __VREToolsWindow,1,2517,7082,6480,1669
 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150
 UserFile: 1

branches/guitools-2.0/shared/smbtree.vrs ¶

@@ -274 +274 @@
             line = linein(smbmachine.I)
 
-            if left(line,5) = "Error" then ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
+            if translate(left(strip(line),5)) = "ERROR" then ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'UserData', "SERVER|"||strip(line))
 
             do while(left(line,1) = '09'x) /* Share loop */
@@ -333 +333 @@
                 end
             end
-            else do /* There are multiple workgroups, we need additional */
-                    /* measures tofind out which is our workgroup */
-                say     '  'samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
-                address cmd samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
-                infoline = linein(samba.!msg)
-                if word(infoline,1) = "creating" then do /* upcase tables are missing */
-                    say "Missing upcase tables detected!"
+            else do
+                if workgroup <> "" then do
+                    /* There are multiple workgroups, we need additional */
+                    /* measures to find out which is our workgroup       */
+                    say     '  'samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
+                    address cmd samba.!smbclientexe' -L "'Machine'" -N 'debuglevel' 2>'samba.!msg' 1>NUL'
                     infoline = linein(samba.!msg)
-                    infoline = linein(samba.!msg)
-                end
-                IF options.!debug == 1 THEN say '  Response = "'Infoline'"'
-                ok = stream(samba.!msg,'c','close')
-                ok = SysFileDelete(samba.!msg)
-
-                parse var infoline "Domain=["WorkGroup"] "Rest
-                wgh = _GetMachinehandle(workgroup)
-                if wgh <> "" & VRMethod('CN_smbtree', 'GetRecordAttr', smbtree.!machine, 'Parent') = "" then do
-                    ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
+                    if word(infoline,1) = "creating" then do /* upcase tables are missing */
+                        say "Missing upcase tables detected!"
+                        infoline = linein(samba.!msg)
+                        infoline = linein(samba.!msg)
+                    end
+                    IF options.!debug == 1 THEN say '  Response = "'Infoline'"'
+                    ok = stream(samba.!msg,'c','close')
+                    ok = SysFileDelete(samba.!msg)
+
+                    parse var infoline "Domain=["WorkGroup"] "Rest
+                    wgh = _GetMachinehandle(workgroup)
+                    if wgh <> "" & VRMethod('CN_smbtree', 'GetRecordAttr', smbtree.!machine, 'Parent') = "" then do
+                        ok = VRMethod('CN_smbtree', 'SetRecordAttr', smbtree.!machine, 'Parent', wgh)
+                    end
+                end
+                else do
+                    /* The machine does not allow browsing and does not report a workgroup */
+                    say '  "'Machine'" does not allow browsing. Unable to determine workgroup.'
                 end
             end