Changeset 1067 for branches

Timestamp:

May 23, 2020, 5:15:32 AM (5 years ago)

Author:

Alex Taylor

Message:

Don't disable encryption option when NTLMv1 is selected.
Don't show error if log file deletion returns rc=2 or less.
Hide client use spnego principal checkbox (option is deprecated in latest client).

Location:

branches/guitools-arcamap-2.5/evfsgui

Files:

• evfsgui.vrx (modified) (7 diffs)
• evfsgui.vry (modified) ( previous)

branches/guitools-arcamap-2.5/evfsgui/evfsgui.vrx

@@ -1913 +1913 @@
 */
 CB_client_use_spnego_Click:
-    advanced.!smbconfchanged = 1
-return
-
-/*:VRX         CB_client_use_spnego_principal_Click
-*/
-CB_client_use_spnego_principal_Click:
     advanced.!smbconfchanged = 1
 return
@@ -2068 +2062 @@
         ok = VRSet("CB_ENCRYPTION1","Set", 0)
         ok = VRSet("CB_KERBEROS51", "Enabled", 0)
-        ok = VRSet("CB_ENCRYPTION1","Enabled", 0)
+        /* ok = VRSet("CB_ENCRYPTION1","Enabled", 0) */
     end
     else do
         ok = VRSet("CB_KERBEROS51", "Enabled", 1)
-        ok = VRSet("CB_ENCRYPTION1","Enabled", 1)
+        /* ok = VRSet("CB_ENCRYPTION1","Enabled", 1) */
     end
 return
@@ -2083 +2077 @@
         ok = VRSet("CB_ENCRYPTION","Set", 0)
         ok = VRSet("CB_KERBEROS5", "Enabled", 0)
-        ok = VRSet("CB_ENCRYPTION","Enabled", 0)
+        /* ok = VRSet("CB_ENCRYPTION","Enabled", 0) */
     end
     else do
         ok = VRSet("CB_KERBEROS5", "Enabled", 1)
-        ok = VRSet("CB_ENCRYPTION","Enabled", 1)
+        /* ok = VRSet("CB_ENCRYPTION","Enabled", 1) */
     end
 return
@@ -3623 +3617 @@
             ok1 = SysFileDelete(Logfiles||'\log.smbc')
             ok2 = SysFileDelete(Logfiles||'\log.ndpsmb')
-            if ok1 <> 0 | ok2 <> 0 then do
+            if ok1 > 2 | ok2 > 2 then do
                 ok = VRMessage('Main', NLVGetMessage(5)' 'Logfiles||'\log.smbc RC='ok1||'0D0A'x||NLVGetMessage(5)' 'Logfiles||'\log.ndpsmb RC='ok2, NLVGetMessage( 5 ), 'E')
             end
@@ -4727 +4721 @@
         client_plaintext_auth       = VRGet("CB_client_plaintext_auth","Set")
         client_use_spnego           = VRGet("CB_client_use_spnego","Set")
+
+        /* This option is deprecated now (ALT 20200522) 
         client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
+        */
 
         client_signing              = ''
@@ -4748 +4745 @@
         call IniSet 'client plaintext auth',       YesNo(client_plaintext_auth), handle
         call IniSet 'client use spnego',           YesNo(client_use_spnego), handle
+
+        /* This option is deprecated now (ALT 20200522)
         call IniSet 'client use spnego principal', YesNo(client_use_spnego_principal), handle
+        */
 
         if client_signing == '' then
@@ -5776 +5776 @@
     ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
 
+    /* This option is deprecated now (ALT 20200522) */
+    client_use_spnego_principal = 0
+/*
     client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
     ok = VRSet("CB_client_use_spnego_principal","Set",client_use_spnego_principal)
+*/
 
     client_max_protocol         = IniGet('client max protocol', 'global', samba.!shadowsmbconf)