Changeset 1058 for trunk/guitools/smbusers/SMBUSERS.VRX

Timestamp:

Apr 24, 2019, 4:12:25 PM (6 years ago)

Author:

Herwig Bauernfeind

Message:

Fix Ticket #324 in cltinit.vrs

File:

• trunk/guitools/smbusers/SMBUSERS.VRX (modified) (1 diff)

trunk/guitools/smbusers/SMBUSERS.VRX

@@ -742 +742 @@
 
     /* Lets see if the credentials are good */
+    /* 3 possible results:
+       1. list of users, each user in one line
+       2. first line is "Anonymous login successful", list of users afterwards
+       3. Samba error NT_STATUS
+       4. Other error
+     */
     ok = VRSet("Main", 'Pointer', 'Wait' )
     say '  'samba.!netexe' rpc user 'DebugLevel' 'UserCred' 1>'samba.!msg
     address cmd samba.!netexe' rpc user 'DebugLevel' 'UserCred' 1>'samba.!msg
-    ok = VRSet("Main", 'Pointer', '<default>' )
+
+    login_ok = 0
     do while lines(samba.!msg) > 0
-        loginLine = linein(samba.!msg)
-        if words(loginline) <> 1 then do
-            if pos("NT_STATUS",loginline) > 0 then leave /* Bad login */
-        end
-        else leave /* Good login */
-        /* retry - we read garbage - probably debug data */
+        loginLine = strip(linein(samba.!msg))
+        select 
+            when loginline = "Anonymous login successful" then do
+                login_ok = 0
+                leave
+            end
+            when pos("NT_STATUS",loginline) > 0 then do /* Bad login */
+                Msg.Text = loginline
+                Msg.Type = "E"
+                call _ShowMsg
+                login_ok = 0
+                leave
+            end
+            when words(loginline) = 1 then do /* looks like an item from the list of users */
+                if _UserIsValid(strip(loginLine)) then do
+                    login_ok = 1
+                end
+                leave
+            end
+            otherwise nop /* we read garbage - probably debug data, let's retry */
+        end
     end
     ok = stream(samba.!msg,'c','close')
     ok = SysFileDelete(samba.!msg)
-
-    /* If did not get a valid user back i.e. the first entry of the list, login was not successful */
-    if \_UserIsValid(strip(loginLine)) then do
+    ok = VRSet("Main", 'Pointer', '<default>' )
+    if \login_ok then do
         Msg.Title = NLVGetMessage(31)': 'Credentials.!username'@'copies('*',length(Credentials.!password))
-        Msg.Text = substr(loginLine, pos("NT_STATUS",loginline))
+        /* Make sure we do not crash in case there was no valid 
+           Samba error, but the user is not valid either */
+        Msg.Text = substr(loginLine, max(pos("NT_STATUS",loginline),1))
         Msg.Type = "E"
         call _ShowMsg