Changeset 1019

Timestamp:

May 10, 2017, 11:53:58 AM (8 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: SSCC: Make server string OS/2 based systems

Location:

trunk/guitools/sscc

Files:

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

trunk/guitools/sscc/sscc.vrp

@@ -4 +4 @@
 MacroPath: VRM:U:\Develop\Samba\trunk\guitools\sscc
 EXEPath: 
-RunParameters: /install
+RunParameters: 
 RunDirectory: U:\Develop\Samba\trunk\guitools\sscc
-VRXWindow: __VREMainWindow,1,2891,5637,5767,8000
-VRXWindow: __VRESectionListWindow,1,1518,13153,10431,3342
-VRXWindow: __VREToolsWindow,0,4031,11804,6992,1669
-VRXWindow: __VREWindListWindow,1,2096,13250,4710,3150
+VRXWindow: __VREMainWindow,1,2867,4577,5767,8000
+VRXWindow: __VRESectionListWindow,1,3156,14791,10431,4686
+VRXWindow: __VREToolsWindow,0,4011,10744,6992,1669
+VRXWindow: __VREWindListWindow,1,2072,13539,4710,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: Installer,1
+UserWindow: RemoveConfig,1

trunk/guitools/sscc/sscc.vrx

@@ -1189 +1189 @@
 return
 
+
 /*:VRX         _SmbConfCreateDefault
 */
@@ -1271 +1272 @@
     Migrate = (arg(1) = 1)
     if \Migrate then do /* when migrating these 4 lines are there already */
+        call lineout smbconf, '# Samba config file created using SSCC ver. 'word(VRGet("Main","Hinttext"),2)
+        call lineout smbconf, '# from 'value("USER",,'OS2ENVIRONMENT')'@'value("HOSTNAME",,'OS2ENVIRONMENT')
+        call lineout smbconf, '# Date: 'date()' 'time()
         section       = '[global]'
         call lineout smbconf, section 
         call lineout smbconf, Indent||'workgroup = 'workgroup
         call lineout smbconf, Indent||'netbios name = 'value('HOSTNAME',,'OS2ENVIRONMENT')
-        call lineout smbconf, Indent||'server string = %h Samba Server for eCS (OS/2)'
-        call lineout smbconf, Indent||'comment = Samba Server for eCS (OS/2)'
+        call lineout smbconf, Indent||'server string = %h Samba Server for OS/2 based systems'
+        call lineout smbconf, Indent||'comment = Samba Server for OS/2 based systems'
     end
 
@@ -1315 +1319 @@
     call lineout smbconf, Indent||'lm announce = Yes'
     call lineout smbconf, Indent||'wins support = Yes'
+    call lineout smbconf, '#'Indent||'Enable next line to overcome Ticket #282'
+    call lineout smbconf, '#'Indent||'nmbd bind explicit broadcast = No'
     call lineout smbconf, Indent||'wide links = No'
     ok = SysFileTree(samba.!printcap,exist.,'FO')
@@ -1349 +1355 @@
     call lineout smbconf, '[HOMES]'
     call lineout smbconf, Indent||"comment = Home directory"
-    smbhome = samba.!bin'\homes'
+    smbhome = ETC'\samba\homes'
     Home = strip(value('Home',,'OS2ENVIRONMENT'),'T','\')
     if Home <> '' then do
@@ -1405 +1411 @@
 
     /* user scripts */
-    call lineout smbconf, ';'||Indent||'user scripts'
+    call lineout smbconf, '#'||Indent||'user scripts'
     call lineout smbconf, Indent||'add user script          = '||smbtools||'\usermod.cmd -a "%u"'
     call lineout smbconf, Indent||'delete user script       = '||smbtools||'\usermod.cmd -x "%u"'
@@ -1413 +1419 @@
 
     /* group scripts */
-    call lineout smbconf, ';'||Indent||'group scripts'
+    call lineout smbconf, '#'||Indent||'group scripts'
     call lineout smbconf, Indent||'add group script              = '||smbtools||'\groupmod.cmd -a "%g"'
     call lineout smbconf, Indent||'delete group script           = '||smbtools||'\groupmod.cmd -x "%g"'
@@ -1420 +1426 @@
 
     /* share scripts */
-    call lineout smbconf, ';'||Indent||'share scripts'
+    call lineout smbconf, '#'||Indent||'share scripts'
     call lineout smbconf, Indent||'add share command = '||smbtools||'\addshare.cmd'
     call lineout smbconf, Indent||'change share command = '||smbtools||'\changeshare.cmd'
@@ -1426 +1432 @@
 
     /* other scripts */
-    call lineout smbconf, ';'||Indent||'other scripts'
+    call lineout smbconf, '#'||Indent||'other scripts'
     call lineout smbconf, Indent||'enumports command = '||smbtools||'\enumports.cmd'
     call lineout smbconf, Indent
@@ -1924 +1930 @@
 return
 
+/*:VRX         CB_NoRoot_Click
+*/
+CB_NoRoot_Click: 
+    if VRGet("CB_NoRoot","set") then do
+        ok = VRset("EF_RootPassword","BackColor","PaleGray")
+        ok = VRset("EF_RootPassword_Repeat","BackColor","PaleGray")
+        ok = VRset("EF_RootPassword","Enabled", 0)
+        ok = VRset("EF_RootPassword_Repeat","Enabled", 0)
+    end
+    else do
+        ok = VRset("EF_RootPassword","BackColor","<default>")
+        ok = VRset("EF_RootPassword_Repeat","BackColor","<default>")
+        ok = VRset("EF_RootPassword","Enabled", 1)
+        ok = VRset("EF_RootPassword_Repeat","Enabled", 1)
+    end
+return
+
 /*:VRX         CB_Null_passwords_Click
 */
@@ -2264 +2287 @@
 return
 
+/*:VRX         EF_RootPassword_Change
+*/
+EF_RootPassword_Change: 
+    if length(VRGet("EF_RootPassword","Value")) < 5 then do
+        ok = VRSet("EF_RootPassword","ForeColor", "Red")
+    end
+    else ok = VRSet("EF_RootPassword","ForeColor", "<default>")
+return
+
 /*:VRX         EF_SECURITY_Change
 */
@@ -2356 +2388 @@
     call _ShowMsg
     ok = SysSetObjectData("<sscc>","PARAMETERS=/config;")
-say "SysSetObjectData ok="ok
+    say "SysSetObjectData ok="ok
     call Installer_Fini
 return
@@ -3207 +3239 @@
        VRGet("Main","WindowState") = "Minimized" then ok = VRMethod("Main", "Restore")
 
-    if samba.!testparmexe <> "" then do
-        address cmd samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
+    if samba.!testparmexe <> "" & Installmode = 0 then do
+        if datatype("log_level") <> "NUM" then log_level = 2
+        address cmd samba.!testparmexe' -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
         call _SmbConfCommitChanges
     end
@@ -3224 +3257 @@
 return
 
+    say samba.!testparmexe' -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
 /*:VRX         RB_PDC_Click
 */
@@ -3251 +3285 @@
 */
 RemoveConfig_Close: 
+    ok = SysSetObjectData("<sscc>","PARAMETERS=/config;")
+    say "SysSetObjectData ok="ok
     call RemoveConfig_Fini
 return