Changeset 1062

Timestamp:

May 9, 2020, 11:26:24 PM (5 years ago)

Author:

Alex Taylor

Message:

ArcaMapper branch - enable optional warning when NT1 protocol flavour is not enabled.

Location:

branches/guitools-arcamap-2.5/evfsgui

Files:

• evfsgui.vrp (modified) (2 diffs)
• evfsgui.vrx (modified) (11 diffs)
• evfsgui.vry (modified) ( previous)
• rc/lang/evfsi_en.mkm (modified) (1 diff)

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

@@ -8 +8 @@
 EXEPath: 
 RunParameters: -NDFS
-RunDirectory: G:\netlabs\svn\samba\trunk\guitools\evfsgui
+RunDirectory: G:\netlabs\svn\samba\branches\guitools-arcamap-2.5\evfsgui
 VRXWindow: __VREMainWindow,1,1831,2457,1012,7841
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1421,15659,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,5474,1665
+VRXWindow: __VREToolsWindow,1,2951,12479,5468,1665
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
@@ -18 +18 @@
 UserWindow: SW_ADVANCED,1
 UserWindow: SW_PROGRESS,1
-UserWindow: SW_MOUNTPOINT,1
-UserWindow: SW_INFO,1
+UserWindow: SW_SMBCONF,1

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

@@ -435 +435 @@
 return
 
+/*:VRX         _CheckClientMinProtocol
+*/
+_CheckClientMinProtocol: PROCEDURE EXPOSE samba. settings. options.
+
+    tmpq = RXQueue('CREATE')
+    orgq = RXQUEUE('SET', tmpq )
+    say samba.!testparmexe '--parameter-name="client min protocol" -s' samba.!smbconf '2>nul |rxqueue' tmpq
+    address cmd samba.!testparmexe '--parameter-name="client min protocol" -s' samba.!smbconf '2>nul |rxqueue' tmpq
+    min_proto = 'default'
+    DO QUEUED()
+        PARSE PULL line
+        min_proto = line
+    END
+    CALL RXQueue 'SET', orgq
+    CALL RXQueue 'DELETE', tmpq
+    say '->' min_proto
+
+    ok = 0
+    IF WORDPOS( min_proto, 'CORE COREPLUS LANMAN1 LANMAN2 NT1') == 0 THEN DO
+        stem.1 = NLVGetMessage( 150 )
+        stem.2 = ''
+        stem.3 = NLVGetMessage( 151 )
+        stem.4 = ''
+        stem.5 = NLVGetMessage( 152 )
+        stem.6 = ''
+        stem.7 = NLVGetMessage( 153 )
+        stem.0 = 7
+        btn.1 = NLVGetMessage( 6 )
+        btn.2 = NLVGetMessage( 7 )
+        btn.3 = NLVGetMessage( 154 )
+        btn.0 = 3
+        ok = VRMessageStem( VRWindow(), 'stem.', NLVGetMessage( 155 ), 'Q', 'btn.', 1, 3 )
+        IF ok == 1 THEN DO
+            handle = IniOpen('global', samba.!smbconf)
+            CALL IniSet 'client min protocol', 'NT1', handle
+            CALL IniSave handle
+            CALL IniClose handle
+        END
+    END
+
+return ok
+
 /*:VRX         _ContainersInit
 */
@@ -904 +946 @@
     say _ucChkObj()
 
+    /* This setting is in OS2.INI so we can clear it immediately without
+     * interfering with the usual INI read/write flow.
+     */
+    IF VRGetIni('SmbConfFlags', 'CheckMinProto', 'User') <> '' THEN DO
+        ok = _CheckClientMinProtocol()
+        IF ok < 3 THEN 
+            CALL VRDelIni 'SmbConfFlags', 'CheckMinProto', 'User'
+    END
+
     IF STREAM( settings.!ini, 'C', 'QUERY EXISTS') == '' THEN DO
         /* First start */
@@ -935 +986 @@
     ELSE DO
         /* Subsequent start */
+
         /* Load window position settings */
         settings.!x = VRGetIni('Settings', 'X', settings.!ini, 'NoClose')
@@ -1719 +1771 @@
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SETTINGS" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"+ "NLVGetMessage(47)" ")
+    ok = VRMethod( "TDL_1", "SetStatusText", 5, NLVGetMessage(132,"1","2"))
     w = VRLoad( "TDL_1", VRWindowPath(), "SW_SMBCONF" )
     ok = VRMethod( "TDL_1", "InsertPage", w,"- "NLVGetMessage(47)" ")
+    ok = VRMethod( "TDL_1", "SetStatusText", 6, NLVGetMessage(132,"2","2"))
     if options.!debug == 1 then say time()' _TabbedDialogSetup done'
 return
@@ -5014 +5068 @@
     CALL VRSet 'CB_TRAC', 'Set', options.!tracmark
 
-    ok = VRSet("DT_About","Caption", Program' (c) 2007-2018 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
+    ok = VRSet("DT_About","Caption", Program' (c) 2007-2020 Alexander Taylor for Arca Noae '||'0D0A'x||'and Herwig Bauernfeind for bww bitwise works GmbH.')
 
     About.DscFH  = VRMethod( "CN_ABOUT", "AddField", "String", "Component" )
@@ -5205 +5259 @@
         say '  Icon:     "'SMBObj.icon'"'
     end
-say "Vorher:"rpc.srvinfo.OS_VERSION
+/* say "Vorher:"rpc.srvinfo.OS_VERSION */
     drop rpc.
-say "Vorher:"rpc.srvinfo.OS_VERSION
+/* say "Vorher:"rpc.srvinfo.OS_VERSION */
     rpc_success = _rpcsrvinfo(SMBObj.resname,credentials.!username,credentials.!password)
 
@@ -5532 +5586 @@
 /*  call VRSet "SW_ADVANCED", "HelpTag", NLVGetMessage(40) */
 
+    CALL SW_SETTINGS_Init_Content
+
 /*  call VRMethod "SW_SETTINGS", "CenterWindow" */
     ok = VRSet("SW_SETTINGS", "Visible", 1)
@@ -5616 +5672 @@
     call NLVSetText "PB_SMBCONF_HELP",   "Caption", 4
 
+    CALL SW_SMBCONF_Init_Content
 return
 
@@ -5622 +5679 @@
 SW_SMBCONF_Init_Content:
     call _SmbConfCreateShadowCopy
-
+say 'Populating current smb.conf settings'
     client_NTLMv2_auth          = ZeroOne(IniGet('client NTLMv2 auth', 'global', samba.!shadowsmbconf))
     if client_NTLMv2_auth = 1 then do
@@ -5647 +5704 @@
         ok = VRSet("DT_client_max_protocol","Enabled", 0) */
     end
-    else ok = VRSet("SPIN_client_max_protocol","Value",client_max_protocol)
+    else do
+        parse var client_max_protocol main_proto'_'sub_proto
+        ok = VRSet("SPIN_client_max_protocol","Value",main_proto)
+    end
 
     client_min_protocol         = IniGet('client min protocol', 'global', samba.!shadowsmbconf)
@@ -5654 +5714 @@
         ok = VRSet("DT_client_min_protocol","Enabled", 0) */
     end
-    else ok = VRSet("SPIN_client_min_protocol","Value",client_min_protocol)
+    else do
+        parse var client_min_protocol main_proto'_'sub_proto
+        ok = VRSet("SPIN_client_min_protocol","Value",main_proto)
+    end
 
     client_signing         = IniGet('client signing', 'global', samba.!shadowsmbconf)

branches/guitools-arcamap-2.5/evfsgui/rc/lang/evfsi_en.mkm

@@ -156 +156 @@
 EVG0145I: Support Kerberos5
 EVG0146I: Support encryption
+EVG0147?:
+EVG0148?:
+EVG0149?:
+EVG0150I: For security reasons, the latest Samba software does not enable the SMB1 protocol by default.
+EVG0151I: This may cause some LAN devices and/or servers (especially those older than 2013) to no longer be visible.
+EVG0152I: Do you want to enable the SMB1 protocol? This can allow more LAN devices to be usable, but is considered less secure.
+EVG0153I: Note: You can configure this later by setting "client min protocol" to "NT1" (or lower) on the second page of Global settings.
+EVG0154I: Ask ~Later
+EVG0155I: Protocol Compatibility
+