Changeset 925 for trunk/guitools/evfsgui

Timestamp:

Jun 16, 2016, 4:43:52 PM (9 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: EVFSGUI: more client settings, SMBMON: made rpm/yum aware, cosmetics

Location:

trunk/guitools/evfsgui

Files:

• evfsgui.vrp (modified) (1 diff)
• evfsgui.vrx (modified) (4 diffs)
• evfsgui.vry (modified) ( previous)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -11 +11 @@
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,5477,1659
+VRXWindow: __VREToolsWindow,1,2951,12479,5474,1665
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1778 +1778 @@
 return
 
+/*:VRX         CB_client_NTLMv2_auth_Click
+*/
+CB_client_NTLMv2_auth_Click: 
+    advanced.!smbconfchanged = 1
+
+    if VRGet("CB_client_NTLMv2_auth","Set") = 0 then do
+        ok = VRSet("CB_client_lanman_auth","Enabled", 1)
+        ok = VRSet("CB_client_plaintext_auth","Enabled", 1)
+    end
+    else do
+        ok = VRSet("CB_client_lanman_auth","Enabled", 0)
+        ok = VRSet("CB_client_lanman_auth","Set", 0)
+        ok = VRSet("CB_client_plaintext_auth","Enabled", 0)
+        ok = VRSet("CB_client_plaintext_auth","Set", 0)
+    end
+return
+
 /*:VRX         CB_client_plaintext_auth_Click
 */
@@ -4454 +4471 @@
 PB_SMBCONF_APPLY_Click:
     if advanced.!smbconfchanged = 1 then do
+        client_NTLMv2_auth          = VRGet("CB_client_NTLMv2_auth","Set")
         client_lanman_auth          = VRGet("CB_client_lanman_auth","Set")
         client_plaintext_auth       = VRGet("CB_client_plaintext_auth","Set")
         client_use_spnego           = VRGet("CB_client_use_spnego","Set")
         client_use_spnego_principal = VRGet("CB_client_use_spnego_principal","Set")
+        client_signing              = VRGet("SPIN_client_signing","Value")
+        client_ipc_signing          = VRGet("SPIN_client_ipc_signing","Value")
+
+        if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
+            client_max_protocol         = VRGet("SPIN_client_max_protocol","Value")
+            client_min_protocol         = VRGet("SPIN_client_min_protocol","Value")
+        end
+
 
         handle = IniOpen('global', samba.!smbconf)
+        call IniSet 'client NTLMv2 auth',          YesNo(client_NTLMv2_auth), handle
         call IniSet 'client lanman auth',          YesNo(client_lanman_auth), handle
         call IniSet 'client plaintext auth',       YesNo(client_plaintext_auth), handle
         call IniSet 'client use spnego',           YesNo(client_use_spnego), handle
         call IniSet 'client use spnego principal', YesNo(client_use_spnego_principal), handle
+        call IniSet 'client signing',              client_signing, handle
+        call IniSet 'client ipc signing',          client_ipc_signing, handle
+
+        if VRGet("SPIN_client_max_protocol","Enabled") = 1 then do
+            call IniSet 'client max protocol',         client_max_protocol, handle
+            call IniSet 'client min protocol',         client_min_protocol, handle
+        end
 
         call IniSave handle
@@ -4737 +4771 @@
     if options.!debug == 1 then say time()' '||"Refresh done"
 RETURN 0
+
+/*:VRX         SPIN_client_ipc_signing_Change
+*/
+SPIN_client_ipc_signing_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_client_max_protocol_Change
+*/
+SPIN_client_max_protocol_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_client_min_protocol_Change
+*/
+SPIN_client_min_protocol_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_client_signing_Change
+*/
+SPIN_client_signing_Change: 
+    advanced.!smbconfchanged = 1
+return
 
 /*:VRX         SPIN_NRO1_Change
@@ -5386 +5444 @@
     call _SmbConfCreateShadowCopy
 
-    client_lanman_auth          = ZeroOne(IniGet('client lanman auth', 'global', samba.!shadowsmbconf))
-    client_plaintext_auth       = ZeroOne(IniGet('client plaintext auth', 'global', samba.!shadowsmbconf))
+    client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
+    if client_NTLMv2_auth = 1 then do
+        ok = VRSet("CB_client_NTLMv2_auth","Set",client_NTLMv2_auth)        
+        ok = VRSet("CB_client_lanman_auth","Enabled", 0)
+        ok = VRSet("CB_client_plaintext_auth","Enabled", 0)
+    end
+    else do
+        client_lanman_auth          = ZeroOne(IniGet('client lanman auth', 'global', samba.!shadowsmbconf))
+        client_plaintext_auth       = ZeroOne(IniGet('client plaintext auth', 'global', samba.!shadowsmbconf))
+        ok = VRSet("CB_client_lanman_auth","Set",client_lanman_auth)
+        ok = VRSet("CB_client_plaintext_auth","Set",client_plaintext_auth)
+    end
+
     client_use_spnego           = ZeroOne(IniGet('client use spnego', 'global', samba.!shadowsmbconf))
+    ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
+
     client_use_spnego_principal = ZeroOne(IniGet('client use spnego principal', 'global', samba.!shadowsmbconf))
-
-    ok = VRSet("CB_client_lanman_auth","Set",client_lanman_auth)
-    ok = VRSet("CB_client_plaintext_auth","Set",client_plaintext_auth)
-    ok = VRSet("CB_client_use_spnego","Set",client_use_spnego)
     ok = VRSet("CB_client_use_spnego_principal","Set",client_use_spnego_principal)
+
+    client_max_protocol         = IniGet('client max protocol', 'global', samba.!shadowsmbconf)
+    if client_max_protocol = "" then do
+        ok = VRSet("SPIN_client_max_protocol","Enabled", 0)
+        ok = VRSet("DT_client_max_protocol","Enabled", 0)
+    end
+    else ok = VRSet("SPIN_client_max_protocol","Value",client_max_protocol)
+
+    client_min_protocol         = IniGet('client min protocol', 'global', samba.!shadowsmbconf)
+    if client_min_protocol = "" then do
+        ok = VRSet("SPIN_client_min_protocol","Enabled", 0)
+        ok = VRSet("DT_client_min_protocol","Enabled", 0)
+    end
+    else ok = VRSet("SPIN_client_min_protocol","Value",client_min_protocol)
+
+    client_signing         = IniGet('client signing', 'global', samba.!shadowsmbconf)
+    client_ipc_signing     = IniGet('client ipc signing', 'global', samba.!shadowsmbconf)
+say "client_signing ="client_signing
+    ok = VRSet("SPIN_client_signing","Value",client_signing)
+    ok = VRSet("SPIN_client_ipc_signing","Value",client_signing)
 
     advanced.!smbconfchanged = 0