Changeset 1046 for trunk/guitools/sscc

Timestamp:

Jan 24, 2018, 12:04:42 PM (8 years ago)

Author:

Herwig Bauernfeind

Message:

SSCC: Fix log level not being saved in Samba 3.6

Location:

trunk/guitools/sscc

Files:

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

trunk/guitools/sscc/sscc.vrp

@@ -7 +7 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\sscc
 VRXWindow: __VREMainWindow,1,2867,4673,1012,7902
-VRXWindow: __VRESectionListWindow,1,1482,13924,10431,4686
-VRXWindow: __VREToolsWindow,0,4011,10841,6992,1669
+VRXWindow: __VRESectionListWindow,1,1506,14406,10431,4686
+VRXWindow: __VREToolsWindow,0,3999,10841,6486,1669
 VRXWindow: __VREWindListWindow,1,2072,13539,4710,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: Installer,1
-UserWindow: RemoveConfig,1

trunk/guitools/sscc/sscc.vrx

@@ -1084 +1084 @@
         call lineout trg, smbline
         lct = lct + 1
+        if pos("log file",smbline) > 0 then do
+            call lineout trg, '09'x||'log level = 'VRGet("EF_LOG_LEVEL","value")
+            lct = lct + 1
+        end
     end
     say "Lines saved "lct
@@ -1180 +1184 @@
         section       = '[global]'
         call lineout smbconf, section 
+        if workgroup = '' then workgroup = 'WORKGROUP' /* make sure we have no empty default, set to Windows default */
         call lineout smbconf, Indent||'workgroup = 'workgroup
         call lineout smbconf, Indent||'netbios name = 'value('HOSTNAME',,'OS2ENVIRONMENT')
@@ -3146 +3151 @@
 
     if samba.!testparmexe <> "" & Installmode = 0 then do
-        if datatype("log_level") <> "NUM" then log_level = 2
+        if datatype("log_level") <> "NUM" then log_level = VRGet("EF_LOG_LEVEL","Value")
+call lineout "D:\testlog", "das erste log_level = '"log_level"'"
+call lineout "D:\testlog", "pos check "pos(log_level,'012345678910')
+        if pos(log_level,'012345678910') = 0 then log_level = 2
+call lineout "D:\testlog", "Das zweite log_level = '"log_level"'"
+        say         samba.!testparmexe' -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
         address cmd samba.!testparmexe' -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
         call _SmbConfCommitChanges
@@ -3163 +3173 @@
 return
 
-    say samba.!testparmexe' -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
 /*:VRX         RB_PDC_Click
 */