Changeset 990

Timestamp:

Dec 9, 2016, 10:06:20 AM (5 years ago)

Author:

Herwig Bauernfeind

Message:

GUITools: All changes that have built over time.

Location:

trunk/guitools

Files:

• evfsgui/evfsgui.vrp (modified) (2 diffs)
• evfsgui/evfsgui.vrx (modified) (7 diffs)
• evfsgui/evfsgui.vry (modified) (previous)
• shared/inittempdir.vrs (modified) (1 diff)
• shared/nlv.vrs (modified) (5 diffs)
• shared/sambainit.vrs (modified) (1 diff)
• shared/smbtree.vrs (modified) (9 diffs)
• shared/swat.vrs (added)
• smbmon/rc/icons/smbmon.ico (modified) (previous)
• smbmon/rc/icons/user.ico (modified) (previous)
• smbmon/rc/lang/smbmon_de.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_en.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_es.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_fr.mkm (modified) (1 diff)
• smbmon/rc/lang/smbmon_sv.mkm (modified) (1 diff)
• smbmon/smbmon.rc (modified) (2 diffs)
• smbmon/smbmon.vrp (modified) (1 diff)
• smbmon/smbmon.vrx (modified) (20 diffs)
• smbmon/smbmon.vry (modified) (previous)
• smbusers (added)
• smbusers/SMBUSERS.VRX (added)
• smbusers/SMBUSERS.VRY (added)
• smbusers/mkmsg.cmd (added)
• smbusers/mkzip.cmd (added)
• smbusers/rc (added)
• smbusers/rc/icons (added)
• smbusers/rc/icons/add_group.ico (added)
• smbusers/rc/icons/add_group_d.ico (added)
• smbusers/rc/icons/add_rem_users.ICO (added)
• smbusers/rc/icons/add_users.ICO (added)
• smbusers/rc/icons/add_users_d.ICO (added)
• smbusers/rc/icons/bww_bw.bmp (added)
• smbusers/rc/icons/bww_logo.bmp (added)
• smbusers/rc/icons/del_group.ico (added)
• smbusers/rc/icons/del_group_d.ico (added)
• smbusers/rc/icons/group.ico (added)
• smbusers/rc/icons/join_group.ico (added)
• smbusers/rc/icons/join_group_d.ico (added)
• smbusers/rc/icons/leave_group.ico (added)
• smbusers/rc/icons/leave_group_d.ico (added)
• smbusers/rc/icons/map_group.ico (added)
• smbusers/rc/icons/map_group_d.ico (added)
• smbusers/rc/icons/netlabs.bmp (added)
• smbusers/rc/icons/pid.ico (added)
• smbusers/rc/icons/policies.ico (added)
• smbusers/rc/icons/rem_users.ICO (added)
• smbusers/rc/icons/rem_users2.ICO (added)
• smbusers/rc/icons/rem_users_d.ICO (added)
• smbusers/rc/icons/script.ICO (added)
• smbusers/rc/icons/script_d.ico (added)
• smbusers/rc/icons/settings.ico (added)
• smbusers/rc/icons/smbusers.ico (added)
• smbusers/rc/icons/smbusers_1x.ico (added)
• smbusers/rc/icons/unmap_group.ico (added)
• smbusers/rc/icons/unmap_group_d.ico (added)
• smbusers/rc/icons/user.ico (added)
• smbusers/rc/icons/wellk_group.ico (added)
• smbusers/rc/icons/wellk_group_d.ico (added)
• smbusers/rc/lang (added)
• smbusers/rc/lang/smbusers_de.mkm (added)
• smbusers/rc/lang/smbusers_en.mkm (added)
• smbusers/rc/lang/smbusers_es.mkm (added)
• smbusers/rc/lang/smbusers_fr.mkm (added)
• smbusers/rc/lang/smbusers_sv.mkm (added)
• smbusers/readme.smbusers (added)
• smbusers/smbusers.RC (added)
• smbusers/smbusers.VRP (added)
• smbusers/smbusers_de.msg (added)
• smbusers/smbusers_en.msg (added)
• smbusers/smbusers_es.msg (added)
• smbusers/smbusers_fr.msg (added)
• smbusers/smbusers_sv.msg (added)
• sscc/rc/lang/sscc_de.mkm (modified) (4 diffs)
• sscc/rc/lang/sscc_en.mkm (modified) (4 diffs)
• sscc/rc/lang/sscc_es.mkm (modified) (5 diffs)
• sscc/rc/lang/sscc_fr.mkm (modified) (5 diffs)
• sscc/rc/lang/sscc_sv.mkm (modified) (5 diffs)
• sscc/readme.samba (modified) (3 diffs)
• sscc/sscc.RC (modified) (1 diff)
• sscc/sscc.vrp (modified) (1 diff)
• sscc/sscc.vrx (modified) (45 diffs)
• sscc/sscc.vry (modified) (previous)

trunk/guitools/evfsgui/evfsgui.vrp

@@ -3 +3 @@
 VRX: wps_open.VRX
 VXOFile: VROBJEX
+VXOFile: VRSPLIT
 ClassFile: VRSPLITB.DLL
 MacroPath: VRM:G:\netlabs\svn\samba\trunk\guitools\evfsgui
@@ -11 +12 @@
 VRXWindow: __VREFileListWindow,1,711,14020,2665,3358
 VRXWindow: __VRESectionListWindow,1,1072,11708,12238,6914
-VRXWindow: __VREToolsWindow,1,2951,12479,5474,1665
+VRXWindow: __VREToolsWindow,1,2951,12479,6992,1661
 VRXWindow: __VREWindListWindow,1,566,10262,4963,3150
 UserFile: 1
 UserWindow: Main,1
 UserWindow: SW_PROGRESS,1
+UserWindow: SW_SETTINGS,1
 UserWindow: SW_SMBCONF,1

trunk/guitools/evfsgui/evfsgui.vrx

@@ -1558 +1558 @@
     /* however it is not desirable to always have a complete copy normally */
     ok = SysFileDelete(samba.!shadowsmbconf)
-    say     '  'samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
-    address cmd samba.!testparmexe' -v -s 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    if datatype(log_level) <> "NUM" then log_level = 2
+    say     '  'samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    address cmd samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
     if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy done'
 return
@@ -4393 +4394 @@
 */
 PB_SETTINGS_APPLY_Click:
-    advanced.!loglevel    = VRGet("SPIN_LOGLEVEL", "Value" )
+    advanced.!loglevel    = VRGet("SPIN_LOG_LEVEL", "Value" )
     advanced.!logfile     = VRGet("EF_LOGFILE",    "Value" )
     advanced.!browseauth  = VRGet("CB_BROWSEAUTH", "Set" )
@@ -4447 +4448 @@
         if \_IsValidIPAddress(VRGet("EF_WINS_SERVER","Value")) then ok = VRSet("EF_WINS_SERVER","Value","")
         call IniSet 'wins server', VRGet("EF_WINS_SERVER","Value"), handle
+        call IniSet 'log level', VRGet("SPIN_LOG_LEVEL","Value"), handle
         call IniSave handle
         call IniClose handle
@@ -4793 +4795 @@
 */
 SPIN_client_signing_Change: 
+    advanced.!smbconfchanged = 1
+return
+
+/*:VRX         SPIN_LOG_LEVEL_Change
+*/
+SPIN_LOG_LEVEL_Change: 
     advanced.!smbconfchanged = 1
 return
@@ -5382 +5390 @@
     if advanced.!miniicons   \= ""  then ok = VRSet("CB_MINIICONS",  "Set",   advanced.!miniicons)
 
-    /* Obsolete */
-    if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)
-    if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOGLEVEL", "Value", advanced.!loglevel)
-
+/*  if advanced.!logfile     \= ""  then ok = VRSet("EF_LOGFILE",    "Value", advanced.!logfile)     /* Obsolete */
+    if advanced.!loglevel    \= "0" then ok = VRSet("SPIN_LOG_LEVEL", "Value", advanced.!loglevel) */
+
+    log_level = IniGet('log level', 'global', samba.!smbconf)
     call _SmbConfCreateShadowCopy
+
+
+say "log level ="log_level
+    if log_level = "" then log_level = 2
+say "log level ="log_level
+    ok = VRSet("SPIN_LOG_LEVEL","Value",log_level)
 
     wins_support = translate(IniGet('wins support', 'global', samba.!shadowsmbconf))
@@ -5465 +5479 @@
     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)
+     /* 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)
@@ -5472 +5486 @@
     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)
+     /* 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)

trunk/guitools/shared/inittempdir.vrs

@@ -7 +7 @@
     HaveNoTMPDIR  = 0
     TempDir       = translate(value('TMPDIR',,'OS2ENVIRONMENT'),'\','/')
-    IF options.!debug == 1 THEN say '  TMPDIR="'TempDir'"'
+    IF options.!debug == 1 THEN say '  TMPDIR = "'TempDir'"'
     if TempDir = '' then do
         HaveNoTMPDIR  = 1
         TempDir = translate(value('TEMP',,'OS2ENVIRONMENT'),'\','/')
-        IF options.!debug == 1 THEN say '  TEMP="'TempDir'"'
+        IF options.!debug == 1 THEN say '  TEMP = "'TempDir'"'
     end
     if TempDir = '' then do
         TempDir = translate(value('TMP',,'OS2ENVIRONMENT'),'\','/')
-        IF options.!debug == 1 THEN say '  TMP="'TempDir'"'
+        IF options.!debug == 1 THEN say '  TMP = "'TempDir'"'
     end
     if TempDir = '' then do

trunk/guitools/shared/nlv.vrs

@@ -31 +31 @@
         when settings.!nlv8dot3 = 0 then filestem = filestem||'_'
         when translate(filestem) = "EVFSGUI" then filestem = "evfsi_"
-        otherwise filestem = SUBSTR( filestem, 1, 5 )||'_' 
+        otherwise filestem = strip(SUBSTR( filestem, 1, 5 ))||'_' 
     end
     say '  NLV filestem   = "'filestem'"'
@@ -60 +60 @@
     Suffix  = arg(3)
     PathVar = arg(4)
-    say time()" NLVSearch() started"
     NLVSrchDone = 0
     NLVFile = ""
@@ -67 +66 @@
         say '  NLV 'Suffix' file   = "'filestem||nlv'.'Suffix'"'
         select
+            when VRFileExists(execdir'\'filestem||nlv'.'Suffix) then do
+                say "  Attempt1: NLV "Suffix" file found directly!"
+                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
             when VRFileExists(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix) then do
-                say "  NLV "Suffix" file found directly!"
+                say "  Attempt2: NLV "Suffix" file found directly!"
                 NLVFile = strip(srchRoot'\'SubDir'\'filestem||nlv'.'Suffix,'L','\')
+                NLVSrchDone = 1
+            end
+            when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
+                execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
+                say "  Attempt3: NLV "Suffix" file found via "PathVar
+                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
                 NLVSrchDone = 1
             end
@@ -75 +85 @@
                 ok = SysFileTree(UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix,nlvmsg.,'FOS')
                 if nlvmsg.0 = 1 then do
-                    say "  Found  NLV "Suffix" file in rpm/yum subdirectory"
+                    say "  Attempt4: Found  NLV "Suffix" file in rpm/yum subdirectory"
                     NLVFile = VRParseFilename(nlvmsg.1,"DPN")'.'Suffix
                     say "  Adding NLV "Suffix" path to "PathVar
@@ -82 +92 @@
                     NLVSrchDone = 1
                 end
-                else say "  NLV "Suffix" file NOT in rpm/yum subdirectory."
+                else say "  NLV "Suffix" file NOT in rpm/yum "UnixRoot||'\usr\share\os2\'filestem||nlv'.'Suffix"subdirectory."
             end
-            when SysSearchPath(PathVar, filestem||nlv'.'Suffix) \= '' then do
-                execDir = VRParseFileName(SysSearchPath(PathVar, filestem||nlv'.'Suffix),"DP")
-                say "  NLV "Suffix" file found via "PathVar
-                NLVFile = strip(execdir'\'filestem||nlv'.'Suffix,'L','\')
-                NLVSrchDone = 1
-            end
+           
             otherwise do
                 say "  Searching subdirectories"

trunk/guitools/shared/sambainit.vrs

@@ -207 +207 @@
     if \VRFileExists(samba.!smbconf) then call _ErrorDataFileNotFound samba.!smbconf' is not present.'
     IF options.!debug == 1 then say '  Samba smb.conf = "'samba.!smbconf'"'
+
+    /* complete shadow copy of smb.conf in temporary directory - should always be created on the fly */
+    /* before reading from it */
+    samba.!shadowsmbconf = TempDir||'smb.conf'
 
     /* find all datafiles - their locations are fixed */

trunk/guitools/shared/smbtree.vrs

@@ -5 +5 @@
     say time()' _RefreshTree() started'
     FirstRun = 0
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Refreshing network")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", " Refreshing network")
     ok = SysFileDelete(samba.!msg)
     parse var debuglevel .'='level
@@ -54 +54 @@
     if errstat = "READY:" then do
         if file2stem(samba.!error,"treeError.") > 1 then do
-            ok = VRSet("DT_STATUSBAR","Caption", treeError.2)
+            ok = VRSet("DT_STATUSBAR","Caption", " "||treeError.2)
         end
     end
@@ -458 +458 @@
     if UserCred = '-N' then UserCred = ''
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", "Ready.")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption", " Ready.")
     say time()' _AddSharesDisplay() loop end'
 return
@@ -501 +501 @@
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -D 'UserCred' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Enumerating workgroups")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Enumerating workgroups")
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(1)
@@ -563 +563 @@
     address cmd 'detach 'samba.!nmblookupexe' 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Obtaining IP from "machine)
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Obtaining IP from "machine)
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -590 +590 @@
     address cmd 'detach 'samba.!nmblookupexe' -A 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Obtaining capabilities from "machine)
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Obtaining capabilities from "machine)
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -625 +625 @@
     address cmd 'detach 'samba.!nmblookupexe' -S 'machine' 'debuglevel' >'samba.!msg
 
-    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption","Querying "machine" for roles")
+    if VRIsValidObject("DT_STATUSBAR") then ok = VRSet("DT_STATUSBAR","Caption"," Querying "machine" for roles")
     do while stream(samba.!msg,'c','open read') <> "READY:"
         ok = SysSleep(0.33)
@@ -665 +665 @@
 file2stem:
     say time()' file2stem() started'
-    msgfile = arg(1)
-    msgstem = arg(2)
-    delmsgfile = translate(arg(3))
+    msgfile = arg(1) /* file to create stem of */
+    msgstem = arg(2) /* name of the stem */
     if right(msgstem,1) <> '.' then msgstem = msgstem'.'
+    delmsgfile = translate(arg(3)) /* erase file after transfer */
+    skipwords = strip(arg(4)||' creating lame tdb( ***') /* skip lines with these words */
+    do J = 1 to words(skipwords)
+        skip.J = translate(word(skipWords,J))
+    end
+    skip.0 = J
+   
     say '  file2stem("'msgfile'","'msgstem'")'
     dyn = 'drop 'msgstem
     interpret dyn
     stemcount = 0
+    skipped = 0
     do while lines(msgfile) > 0
         stemcount = stemcount + 1
         inline = linein(msgfile)
-        if pos('creating lame',inline) > 0 | pos('tdb(',inline) > 0 then do
-            stemcount = stemcount - 1
-            iterate
-        end
-        dyn = msgstem||stemcount' = inline'
-        interpret dyn
+        SkipIt = 0
+        do J = 1 to skip.0
+        if pos(skip.J,translate(inline)) > 0 then do
+                skipit = 1
+                stemcount = stemcount - 1
+                skipped = skipped + 1
+                leave
+            end
+        end
+        if \SkipIt then do
+            dyn = msgstem||stemcount' = inline'
+            interpret dyn
+        end
     end
     dyn = msgstem||"0 = "stemcount
@@ -689 +703 @@
     
     drop msgfile msgstem
-    say time()' file2stem() ['stemcount'] done'    
+    say time()' file2stem() ['stemcount' added, 'skipped' skipped] done'    
 return stemcount

trunk/guitools/smbmon/rc/lang/smbmon_de.mkm

@@ -24 +24 @@
 SMM0019I: Netzwerkumgebung
 SMM0020I: Produktinformation
-SMM0021I: Die Leute hinter Samba Server fr eComStation (OS/2)
+SMM0021I: Die Leute hinter Samba Server fr OS/2
 SMM0022I: TDB Dateien prfen
 SMM0023?: 

trunk/guitools/smbmon/rc/lang/smbmon_en.mkm

@@ -24 +24 @@
 SMM0019I: Nethood
 SMM0020I: About
-SMM0021I: Samba Server for eComStation is brought to you by
+SMM0021I: Samba Server for OS/2 is brought to you by
 SMM0022I: Check TDB files
 SMM0023I: 

trunk/guitools/smbmon/rc/lang/smbmon_es.mkm

@@ -24 +24 @@
 SMM0019I: "Nethood"
 SMM0020I: Acerca de
-SMM0021I: Servidor Samba para eComStation proporcionado por
+SMM0021I: Servidor Samba para OS/2 proporcionado por
 SMM0022I: Comprobar los archivos TDB
 SMM0023I: 

trunk/guitools/smbmon/rc/lang/smbmon_fr.mkm

@@ -26 +26 @@
 SMM0019I: Voisinage r‚seau
 SMM0020I: · propos de
-SMM0021I: Serveur Samba pour eComStation vous est propos‚ par
+SMM0021I: Serveur Samba pour OS/2 vous est propos‚ par
 SMM0022I: V‚rifier fichiers TDB
 SMM0023I: 

trunk/guitools/smbmon/rc/lang/smbmon_sv.mkm

@@ -24 +24 @@
 SMM0019I: N„tverket
 SMM0020I: Om
-SMM0021I: Samba Server f”r eComStation kommer fran
+SMM0021I: Samba Server f”r OS/2 kommer fran
 SMM0022I: Kontrollera TDB filer
 SMM0023?: 

trunk/guitools/smbmon/smbmon.rc

@@ -1 +1 @@
 icon   1 .\rc\icons\smbmon.ico
-bitmap 2 .\rc\icons\bww_bw.bmp
+bitmap 2 .\rc\icons\bww_logo.bmp
 icon 40 .\rc\icons\start_samba2.ico
 icon 41 .\rc\icons\samba_stop2.ico
@@ -13 +13 @@
 icon 50 .\rc\icons\tag.ico
 icon 51 .\rc\icons\err.ico
+icon 52 .\rc\icons\share.ico
+icon 53 .\rc\icons\settings.ico
 BITMAP 111 ..\shared\rc\throbber\frame_01.bmp 
 BITMAP 112 ..\shared\rc\throbber\frame_02.bmp 

trunk/guitools/smbmon/smbmon.vrp

@@ -7 +7 @@
 RunDirectory: U:\Develop\Samba\trunk\guitools\smbmon
 VRXWindow: __VREMainWindow,1,2180,3614,1024,6769
-VRXWindow: __VRESectionListWindow,1,4083,11226,7372,7685
-VRXWindow: __VREToolsWindow,1,2156,1494,5477,1663
+VRXWindow: __VRESectionListWindow,1,4071,11804,7372,7685
+VRXWindow: __VREToolsWindow,1,2156,1494,6989,1659
 VRXWindow: __VREWindListWindow,1,964,11708,5372,3150
 UserFile: 1
 UserWindow: Main,1
+UserWindow: About,1
 UserWindow: SW_FILES,1
+UserWindow: SW_SETTINGS,1

trunk/guitools/smbmon/smbmon.vrx

@@ -123 +123 @@
     ok = VRMethod("CN_CHKTDB", "SetFieldData", RecHandle, ChkTDBFilesFH, TDBFile, ChkTDBIconFH, "$50", ChkTDBSizeFH, TDBSize||" Bytes" )
     address cmd '@tdbtool 'tdb.I' check 2>'tdb.I'.err 1>'tdb.I'.out'
-    out = linein(tdb.I'.out')
-    ok = stream(tdb.I'.out','c','close')
+    ok = file2stem(tdb.I'.out',"out.")
+    out = out.ok
     say out
     if pos('integrity is OK',out) > 0 then do /* integrity is ok */
@@ -489 +489 @@
 
     /* Statusbar */
-    ok = VRSet("DT_STATUSBAR","Caption", VRGet("Main", "HintText"))
+    ok = VRSet("DT_STATUSBAR","Caption", " "||VRGet("Main", "HintText"))
 
     call Main_Resize
@@ -587 +587 @@
     advanced.!bigicons = VRGetIni( "Settings", "BigIcons", OurINI)
     if advanced.!bigicons = "" then advanced.!bigicons = 0
+
+    advanced.!smbconfchanged = 0
 
     /* For Browse page */
@@ -664 +666 @@
     call PRLoadFuncs
 
+    call rxfuncadd 'IniLoadFuncs', 'REXXINI', 'IniLoadFuncs'
+    call IniLoadFuncs
+
+    call RxFuncAdd 'RxDate', 'RexxDate', 'RxDate'
+
     SIGNAL OFF SYNTAX
     IF options.!debug == 1 then say time()' _LoadotherFuncs() done'
@@ -698 +705 @@
     ok = VRSet("Main","helpFile", settings.!helpfile)
 
+
+
     CALL NLVSetText 'PB_Refresh',  'Caption', 11
+    CALL NLVSetText 'PB_Apply',    'Caption', 10
     CALL NLVSetText 'PB_Cancel',   'Caption', 12
     CALL NLVSetText 'PB_Help',     'Caption', 13
@@ -745 +755 @@
     address cmd samba.!smbd' -V --debuglevel=0 2>'refresherr' 1>'refreshoutput
 
-    SambaVer = "Samba "||strip(linein(refreshoutput))
+    do while lines(refreshoutput) > 0
+        Hdr = linein(refreshoutput)
+        if pos("Version ",Hdr) > 0 then leave
+    end
+
+    SambaVer = "Samba "||strip(Hdr)
     say '  smbd.exe:  "'SambaVer'"'
     ok = stream(refreshoutput,'c','close')
@@ -752 +767 @@
     address cmd samba.!smbstatusexe' smbd 'DebugLevel' 2>'refresherr' 1>'refreshoutput
 
-    /* First line is usually empty */
-    Hdr      = linein(refreshoutput)
-    SambaStVer = strip(linein(refreshoutput)) /* we can detect version mismatches here */
+    do while lines(refreshoutput) > 0
+        Hdr = linein(refreshoutput)
+        if pos("Samba version",Hdr) > 0 then leave
+    end
+
+    SambaStVer = strip(Hdr) /* we can detect version mismatches here */
     say '  smbstatus: "'SambaStVer'"'
 
@@ -1266 +1284 @@
 return
 
+/*:VRX         _SmbConfCreateShadowCopy
+*/
+_SmbConfCreateShadowCopy:
+    if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy started'
+    /* we create a complete version of smb.conf in temporary directory for reading purposes */
+    /* as we can only determine a default value from this complete version of the file */
+    /* however it is not desirable to always have a complete copy normally */
+    ok = SysFileDelete(samba.!shadowsmbconf)
+    if dataype(log_Level) <> "NUM" then log_level = 2
+    say     '  'samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    address cmd samba.!testparmexe' -v -s -d='log_level' 1>'samba.!shadowsmbconf' 2>'TempDir'testparm.stderr'
+    if options.!debug == 1 then say time()' _SmbConfCreateShadowCopy done'
+return
+
 /*:VRX         _TabbedDialogSetup
 */
@@ -1306 +1338 @@
     call About_Init
     ok = VRSet("About","Caption", NLVGetMessage(20))
-    ok = VRSet("PB_AboutOK","Caption", NLVGetMessage(2))
-    SambaTeam.0 = 9
+    ok = VRSet("PB_AboutOK1","Caption", NLVGetMessage(2))
+    SambaTeam.0 = 11
     SambaTeam.1 = 'Silvan Scherrer'
     SambaTeam.2 = 'Herwig Bauernfeind'
-    SambaTeam.3 = 'Vitali Pelenyov'
-    SambaTeam.4 = 'Paul Smedley'
-    SambaTeam.5 = 'Yuri Dario'
-    SambaTeam.6 = 'Alex Taylor'
-    SambaTeam.7 = 'Nikolay Kolosov'
-    SambaTeam.8 = 'All the Samba people'
-    SambaTeam.9 = 'All the netlabs people'
+    SambaTeam.3 = 'Dmitrij Kuminov'
+    SambaTeam.4 = 'Vitali Pelenyov'
+    SambaTeam.5 = 'Paul Smedley'
+    SambaTeam.6 = 'Yuri Dario'
+    SambaTeam.7 = 'Alex Taylor'
+    SambaTeam.8 = 'Nikolay Kolosov'
+    SambaTeam.9 = 'All the Samba people'
+    SambaTeam.10= 'All the ArcaNoae people'
+    SambaTeam.11= 'All the netlabs people'
     ok = VRSet("About","Font", VRGet("SW_SETTINGS","Font"))
     ok = VRMethod("LB_SambaTeam","AddStringList", "SambaTeam." )
@@ -1359 +1393 @@
         otherwise ok = VRSet("IPB_paper","PicturePath","#5;#5")
     end */
-return
-
-/*:VRX         CB_Debug_Click
-*/
-CB_Debug_Click: 
-    options.!Debug = VRGet("CB_Debug","set")
-    if options.!Debug then ok = VRREdirectStdIO("ON")
-                      else ok = VRREdirectStdIO("OFF")
-return
-
-/*:VRX         CB_DetectZombies_Click
-*/
-CB_DetectZombies_Click: 
-    DetectZombies = VRGet("CB_DetectZombies","set")
-    say 'DetectZombies = "'DetectZombies'"'
-return
-
-/*:VRX         CB_NoMsgBox_Click
-*/
-CB_NoMsgBox_Click: 
-    NoMsgBox = VRGet("CB_NoMsgBox","set")
-    say 'NoMsgBox = "'NoMsgBox'"'
-return
-
-/*:VRX         CB_WPSSTARTSTOP_Click
-*/
-CB_WPSSTARTSTOP_Click: 
-    WPSStartStop = VRGet("CB_WPSStartStop","set")
-    say 'WPSStartStop = "'WPSStartStop'"'
 return
 
@@ -1837 +1842 @@
 return
 
+/*:VRX         EF_log_file_Change
+*/
+EF_log_file_Change: 
+    advanced.!smbconfchanged = 1 
+return
+
 /*:VRX         Fini
 */
@@ -1943 +1954 @@
 
     /* if main_iheight < 5500 then ok = VRSet("Main","Height",6200) */
-    sbar_height  = 209                                          /* Height of status-bar */
+    sbar_height  = margin * 8                                          /* Height of status-bar */
     marginx2     = margin * 2                                   /* Common margin around controls */
+    marginx4     = margin * 4
 
     pbtn_dist    = 980
-    pbtn_nr      = 4
+    pbtn_nr      = 5
     pbtn_pos     = max((main_iwidth - pbtn_Dist * pbtn_Nr)%2, 0)+ margin
     pbtn_height  = 400                                          /* Height of the panels' internal button areas */
@@ -1972 +1984 @@
     ok = VRSet("DT_STATUSBAR", "Width", pane_width - 24)
 
-    ok = VRSet("PB_Refresh","top", pane_height + margin * 4 )
-    ok = VRSet("PB_Help",   "top", pane_height + margin * 4 )
-    ok = VRSet("PB_Cancel", "top", pane_height + margin * 4 )
-    ok = VRSet("PB_About",  "top", pane_height + margin * 4 )
-
-    ok = VRSet("PB_Refresh","left",pbtn_pos + pbtn_dist * (pbtn_nr - 4))
-    ok = VRSet("PB_Help",   "left",pbtn_pos + pbtn_dist * (pbtn_nr - 3))
-    ok = VRSet("PB_About",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 2))
+    ok = VRSet("PB_Refresh","top", pane_height + marginx4 )
+    ok = VRSet("PB_Help",   "top", pane_height + marginx4 )
+    ok = VRSet("PB_Cancel", "top", pane_height + marginx4 )
+    ok = VRSet("PB_Apply",  "top", pane_height + marginx4 )
+    ok = VRSet("PB_About",  "top", pane_height + marginx4 )
+
+    ok = VRSet("PB_Refresh","left",pbtn_pos + pbtn_dist * (pbtn_nr - 5))
+    ok = VRSet("PB_Help",   "left",pbtn_pos + pbtn_dist * (pbtn_nr - 4))
+    ok = VRSet("PB_About",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 3))
+    ok = VRSet("PB_Apply",  "left",pbtn_pos + pbtn_dist * (pbtn_nr - 2))
     ok = VRSet("PB_Cancel", "left",pbtn_pos + pbtn_dist * (pbtn_nr - 1))
 
@@ -2054 +2068 @@
     ok = VRset("GB_SETTINGS","Left",   marginx2)
     ok = VRset("GB_SETTINGS","Width",  pane_width - 760)
-    ok = VRset("GB_SETTINGS","Height", pane_height- 1020)
+    ok = VRset("GB_SETTINGS","Height", pane_height- 1020- marginx2)
 
 
@@ -2144 +2158 @@
 return
 
+/*:VRX         PB_AboutOK1_Click
+*/
+PB_AboutOK1_Click: 
+    call About_Close
+return
+
 /*:VRX         PB_AboutOK_Click
 */
 PB_AboutOK_Click: 
     call About_Close
+return
+
+/*:VRX         PB_Apply_Click
+*/
+PB_Apply_Click:
+    IF options.!debug == 1 then say time()' PB_Apply_Click() started' 
+    options.!Debug = VRGet("CB_Debug","set")
+    if options.!Debug then ok = VRREdirectStdIO("ON")
+                      else ok = VRREdirectStdIO("OFF")
+    Intervall = VRGet("SPIN_Intervall","Value")
+    ok = VRSet("TM_Refresh","Delay", Intervall * 1000)
+    IntervallMin = VRGet("SPIN_IntervallMin","Value")
+
+    NoMsgBox = VRGet("CB_NoMsgBox","set")
+    say 'NoMsgBox = "'NoMsgBox'"'
+
+    WPSStartStop = VRGet("CB_WPSStartStop","set")
+    say 'WPSStartStop = "'WPSStartStop'"'
+
+    DetectZombies = VRGet("CB_DetectZombies","set")
+    say 'DetectZombies = "'DetectZombies'"'
+
+    if advanced.!smbconfchanged = 1 then do
+        log_level    = VRGet("SPIN_log_level","Value")
+        log_file     = VRGet("EF_log_file","Value")
+        max_protocol = VRGet("SPIN_max_protocol","Value")
+
+        handle = IniOpen('global', samba.!smbconf)
+
+        ok = IniSet('log level',    log_level,    handle)
+        ok = IniSet('log file',     log_file,     handle)
+        ok = IniSet('max protocol', max_protocol, handle)
+
+        ok = IniSave(handle)
+        ok = IniClose(handle)
+        advanced.!smbconfchanged = 0
+    end
+    IF options.!debug == 1 then say time()' PB_Apply_Click() done' 
 return
 
@@ -2368 +2426 @@
 */
 SPIN_Intervall_Change: 
-    Intervall = VRGet("SPIN_Intervall","Value")
-    ok = VRSet("TM_Refresh","Delay", Intervall * 1000)
 return
 
@@ -2375 +2431 @@
 */
 SPIN_IntervallMin_Change: 
-    IntervallMin = VRGet("SPIN_IntervallMin","Value")
+return
+
+/*:VRX         SPIN_log_level_Change
+*/
+SPIN_log_level_Change: 
+    advanced.!smbconfchanged = 1 
+return
+
+/*:VRX         SPIN_max_protocol_Change
+*/
+SPIN_max_protocol_Change: 
+    advanced.!smbconfchanged = 1 
 return
 
@@ -2531 +2598 @@
     end
     drop window
+return
+
+/*:VRX         SW_SETTINGS_Init_Content
+*/
+SW_SETTINGS_Init_Content: 
+    
+    log_level    = IniGet('log level',    'global', samba.!smbconf)
+    log_file     = IniGet('log file',     'global', samba.!smbconf)
+    max_protocol = IniGet('max_protocol', 'global', samba.!smbconf)
+
+    if log_level = "" then log_level = 2
+    if max_protocol = "" then max_protocol = "NT1"
+
+    ok = VRSet("SPIN_LOG_LEVEL","Value",log_level)
+    ok = VRSet("EF_LOG_FILE","Value",log_file)
 return
 
@@ -2667 +2749 @@
     select 
         when page = 1 then do /* daemons */
+            ok = VRSet("Main","WindowIcon","$46")
             ok = VRSet("TM_RefreshDaemons","Enabled", 1)
             ok = VRSet("TM_RefreshDaemons","Delay",   3000)
         end
         when page = 2 then do /* smbtree */
+            ok = VRSet("Main","WindowIcon","$1")
             ok = VRMethod( "CN_SMBTree", "GetRecordList", "All", "handle." ) 
             /* if the page is empty, populate it */
@@ -2676 +2760 @@
         end
         when page = 3 then do /* Users */
-            nop
+            ok = VRSet("Main","WindowIcon","$44")
         end
         when page = 4 then do /* files */
-            nop
+            ok = VRSet("Main","WindowIcon","$1")
         end
         when page = 5 then do /* service */
-            nop
+            ok = VRSet("Main","WindowIcon","$52")
         end
         when page = 6 then do /* chkTDB */
+            ok = VRSet("Main","WindowIcon","$53")
             say "ChkTDB"
             call _ChkTDB
         end
         when page = 7 then do /* Settings */
-            nop
+            ok = VRSet("Main","WindowIcon","$53")
+            call SW_SETTINGS_Init_Content
         end
         otherwise nop

trunk/guitools/sscc/rc/lang/sscc_de.mkm

@@ -18 +18 @@
 SSC0013I: Freigeben
 SSC0014I: Fortfahren
-SSC0015?: 
+SSC0015I: Start/Stop
 SSC0016?: 
 SSC0017?: 
@@ -77 +77 @@
 SSC0070I: Kann transiente TDB Dateien nicht entfernen solange Samba l„uft!
 SSC0071I: Transiente TDB Dateien wirklich entfernen?
-SSC0072I: Die Leute hinter Samba Server fr eComStation (OS/2)
+SSC0072I: Die Leute hinter Samba Server fr OS/2 basierte Systeme
 SSC0073I: Aktuelle Konfiguration
 SSC0074I: Kleine Symbole
@@ -105 +105 @@
 SSC0097I: Standardkonfiguration erzeugen
 SSC0098I: IBM Peer/LANServer Konfiguration migrieren
-SSC0099?:
+SSC0099I: Bibliotheken mit YUM installieren
 SSC0100?: 
 SSC0101?: 
@@ -119 +119 @@
 SSC0111I: Samba anweisen, die Konfiguration neu zu laden
 SSC0112I: Die gemachten Žnderungen speichern
-SSC0113?:
+SSC0113I: Den Server starten oder stoppen
 SSC0114I: Bitte, dieses Programm schlieáen, damit die Installation abgeschlossen werden kann!
 SSC0115I: Keine Benutzer fr SWAT in %1 gefunden!

trunk/guitools/sscc/rc/lang/sscc_en.mkm

@@ -18 +18 @@
 SSC0013I: Share
 SSC0014I: Continue
-SSC0015?: 
+SSC0015I: Start/Stop
 SSC0016?: 
 SSC0017?: 
@@ -77 +77 @@
 SSC0070I: Cannot remove transient TDB files while Samba is running!
 SSC0071I: Really remove transient TDB files?
-SSC0072I: Samba Server for eComStation is brought to you by
+SSC0072I: Samba Server for OS/2 based systems is brought to you by
 SSC0073I: Current configuration
 SSC0074I: Small icons
@@ -105 +105 @@
 SSC0097I: Create Samba default default configuration
 SSC0098I: Migrate IBM Peer/LANServer configuration
-SSC0099?:
+SSC0099I: Install libraries using YUM
 SSC0100?: 
 SSC0101?: 
@@ -119 +119 @@
 SSC0111I: Tell Samba to reload its configuration
 SSC0112I: Save all changes to configuration file
-SSC0113?:
+SSC0113I: Start or stop the server
 SSC0114I: Please, close this program in oder to complete installation!
 SSC0115I: No users for SWAT defined in "%1"!

trunk/guitools/sscc/rc/lang/sscc_es.mkm

@@ -18 +18 @@
 SSC0013I: Compartir
 SSC0014I: Continuar
-SSC0015?: 
+SSC0015I: Start/Stop
 SSC0016?: 
 SSC0017?: 
@@ -77 +77 @@
 SSC0070I: ­No puedo eliminar los archivos TDB transitorios mientras Samba esta funcionando!
 SSC0071I: šEliminar realmente los archivos transitorios TDB?
-SSC0072I: Servidor Samba para eComStation proporcionado por
+SSC0072I: Servidor Samba para OS/2 proporcionado por
 SSC0073I: Configuraci¢n actual
 SSC0074I: Iconos peque€os
@@ -105 +105 @@
 SSC0097I: Crear configuraci¢n por defecto de Samba
 SSC0098I: Migrar configuraci¢n IBM Peer/LANServer
-SSC0099?:
+SSC0099I: Instalar bibliotecas utilizando YUM
 SSC0100?: 
 SSC0101?: 
@@ -119 +119 @@
 SSC0111I: Decirle a Samba que recargue todas sus configuraciones
 SSC0112I: Guardar todos los cambios en el archivo de configuraci¢n
-SSC0113?:
+SSC0113I: Iniciar o detener el servidor
 SSC0114I: Por favor, cerca de este programa en oder para completar la instalaci¢n!
 SSC0115I: No hay usuarios para SWAT se define en "% 1"!
@@ -125 +125 @@
 SSC0117I: ­Advertencia! El sistema no utiliza p gina de c¢digos 850, compruebe si la traducci¢n de caracteres realmente funciona!
 SSC0118I: USER y HOSTNAME ne deben tener el mismo valor (%1)!
-

trunk/guitools/sscc/rc/lang/sscc_fr.mkm

@@ -20 +20 @@
 SSC0013I: Partage
 SSC0014I: Continuer
-SSC0015?: 
+SSC0015I: Start/Stop
 SSC0016?: 
 SSC0017?: 
@@ -83 +83 @@
 SSC0070I: Retrait impossible des fichiers TDB transitoire en cours d'ex‚cution de Samba !
 SSC0071I: Voulez-vous r‚ellement supprimer les fichiers TDB transitoires ?
-SSC0072I: Serveur Samba pour eComStation vous est propos‚ par
+SSC0072I: Serveur Samba pour OS/2 vous est propos‚ par
 SSC0073I: Configuration actuelle
 SSC0074I: Ic“nes ~miniatures
@@ -111 +111 @@
 SSC0097I: Cr‚ation d'une configuration Samba par d‚faut
 SSC0098I: Migration d'une configuration IBM Peer/LANServer
-SSC0099?: 
+SSC0099I: Installer des bibliothŠques en utilisant YUM
 SSC0100?: 
 SSC0101?: 
@@ -126 +126 @@
  Samba de recharger sa configuration
 SSC0112I: Sauvegarde des modifications dans un fichier de configuration
-SSC0113?:
+SSC0113I: D‚marrer ou arrˆter le serveur
 SSC0114I: S'il vous plaŒt, 
  proximit‚ de ce programme afin de compl‚ter l'installation!
@@ -133 +133 @@
 SSC0117I: Attention! SystŠme n'utilise pas codepage 850, s'il vous plaŒt v‚rifier si la traduction de caractŠres fonctionne vraiment!
 SSC0118I: USER et HOSTNAME ne doivent pas avoir le mˆme valeur (%1)!
-

trunk/guitools/sscc/rc/lang/sscc_sv.mkm

@@ -18 +18 @@
 SSC0013I: Dela ut
 SSC0014I: Forts„tta
-SSC0015?: 
+SSC0015I: Start/Stop
 SSC0016?: 
 SSC0017?: 
@@ -77 +77 @@
 SSC0070I: Kan inte ta bort ”verg†ende TDB filer s† l„nge Samba „r ig†ng!
 SSC0071I: ™verg†ende bort TDB filer egentligen? 
-SSC0072I: M„nniskorna bakom Samba Server f”r eComStation (OS/2) 
+SSC0072I: M„nniskorna bakom Samba Server f”r OS/2
 SSC0073I: Aktuella konfigurationen
 SSC0074I: Sm† ikoner
@@ -105 +105 @@
 SSC0097I: Skapa standardkonfiguration f”r Samba
 SSC0098I: Migrera IBM Peer/LANServer-konfiguration
-SSC0099?:
+SSC0099I: Installera bibliotek med anv„ndning YUM
 SSC0100?: 
 SSC0101?: 
@@ -119 +119 @@
 SSC0111I: Se till att Samba laddar in inst„llningarna igen
 SSC0112I: Spara alla f”r„ndringar
-SSC0113?:
+SSC0113I: Starta eller stoppa servern
 SSC0114I: Sn„lla, st„ng det h„r programmet f”r att slutf”ra installationen!
 SSC0115I: Inga anv„ndare av SWAT definieras i "%1"!
@@ -125 +125 @@
 SSC0117I: Varning! Systemet inte anv„nder codepage 850, v„nligen kontrollera om karakt„r ”vers„ttning verkligen fungerar!
 SSC0118I: USER och HOSTNAME b”r inte ha samma v„rde (%1)!
-

trunk/guitools/sscc/readme.samba

@@ -1 @@
-Samba Server version 3.3.16 for eComStation (OS/2) 1.1.1
+Samba Server Version 3.6.25 for OS/2 based systems 1.3.0
 ========================================================
 
@@ -9 +9 @@
 Samba is freely available under the GNU General Public License.
 
-You can use this software on eCS (OS/2) in order to replace most 
-functionality found in outdated products such as IBM Peer, LANServer,
-WarpServer and WarpServer for eBusiness on a modern and technically 
-up to date base.
-
-This release has a number of problems which were discovered after the
-lst release fixed.
-
-NOTE: You need GCC442.DLL for this release!
+You can use this software on OS/2 based systems in order to replace most 
+functionality found in outdated products such as IBM Peer, WarpServer 
+and WarpServer for eBusiness on a modern and technically up to date 
+base.
 
 Homepage:    http://svn.netlabs.org/samba
@@ -24 +19 @@
 
 This software is brought to you by:
-- Silvan Scherrer, Switzerland (code maintainer, SWAT, several important fixes)
-- Herwig Bauernfeind, Austria (code maintainer, GUI tools, installer, scripts, testing)
-- Paul Smedley, Australia (porting)
-- Yuri Dario, Italy (locking code, several important fixes, client code)
+- bww bitwise works GmbH.
+  - Silvan Scherrer, Switzerland (current code maintainer, SWAT)
+  - Dmitry Kuminov, Russian Federation (libcx, tdb code testing)
+  - Herwig Bauernfeind, Austria (GUI tools, installer, scripts, testing)
 - all the Samba people
 
-General feedback can be sent to:
-herwig.bauernfeind@aon.at or
-silvan.scherrer@aroa.ch
-
 Enjoy!

trunk/guitools/sscc/sscc.RC

@@ -1 @@
-icon 1   .\rc\icons\samba_setup.ico
-bitmap 2 .\rc\icons\choosedir.bmp
-bitmap 3 .\rc\icons\choosedird.bmp
-bitmap 4 .\rc\icons\newitem.bmp
-bitmap 5 .\rc\icons\newitemd.bmp
-bitmap 7 .\rc\icons\up.bmp
-bitmap 8 .\rc\icons\down.bmp
-bitmap 9 .\rc\icons\netlabs.bmp
+icon 1 samba_setup.ico
+bitmap 2 choosedir.bmp
+bitmap 3 choosedird.bmp
+bitmap 4 newitem.bmp
+bitmap 5 newitemd.bmp
+bitmap 7 up.bmp
+bitmap 8 down.bmp
+bitmap 9 bww.bmp

trunk/guitools/sscc/sscc.vrp

@@ -1 +1 @@
 VX-REXX OS/2 V2.14 Build B3
 VRX: sscc.VRX
-MacroPath: VRM:U:\Develop\Samba\trunk\guitools\sscc
+VXOFile: VROBJEX
+MacroPath: VRM:U:\Develop\Samba\guitools-1.0\install
 EXEPath: 
 RunParameters: 
-RunDirectory: D:\samba
-VRXWindow: __VREMainWindow,1,2180,3710,903,8000
-VRXWindow: __VRESectionListWindow,1,3276,11997,8648,3342
-VRXWindow: __VREToolsWindow,0,3324,9877,5474,1669
-VRXWindow: __VREWindListWindow,1,927,11997,2337,3336
+RunDirectory: U:\Develop\Samba\guitools-1.0\install
+VRXWindow: __VREMainWindow,1,2891,5541,1012,8106
+VRXWindow: __VRESectionListWindow,1,1072,14309,12057,4276
+VRXWindow: __VREToolsWindow,0,4031,11708,6992,1669
+VRXWindow: __VREWindListWindow,1,1132,15273,3891,3150
 UserFile: 1
 UserWindow: Main,1
-UserWindow: Installer,1

trunk/guitools/sscc/sscc.vrx

@@ -93 +93 @@
 #append U:\Develop\Samba\guitools-1.0\shared\inittempdir.vrs
 #append U:\Develop\Samba\guitools-1.0\shared\sambainit.vrs
-#append U:\Develop\Samba\guitools-2.0\shared\nlv.vrs
 #append U:\Develop\Samba\guitools-1.0\shared\swat.vrs
+#append U:\Develop\Samba\trunk\guitools\shared\nlv.vrs
 */
 return
@@ -211 +211 @@
     IF options.!debug == 1 THEN say "_CreateVocObject() done"
 return Success
+/*:VRX         _DebugLog
+*/
+_DebugLog: 
+    IF options.!debug <> 1 THEN return
+    debugline = strip(arg(1))
+    if pos("started", debugline) > 0 |,
+       pos("aborted", debugline) > 0 |,
+       pos("done",    debugline) > 0 
+            then say time()' 'debugline
+            else say '  'debugline
+return
+
 /*:VRX         _dirdialog
 */
@@ -306 +318 @@
     if \IsCupsPrintcap then call _PrintCapCreate
 
+    stst = NLVGetMessage(15)
+    parse var stst startst '/' stopst
+
+    if _SambaRunning() then do
+        ok = VRSet("PB_StartStop", "BackColor", "Red")
+        ok = VRSet("PB_StartStop", "Caption", stopst)
+    end
+    else do
+        ok = VRSet("PB_StartStop", "BackColor", "Green")
+        ok = VRSet("PB_StartStop", "Caption", startst)
+    end
+
     if SmbConfExists then call _SmbConfLoad
                      else ok = VRSet("TM_Installer","Enabled", 1)
@@ -314 +338 @@
 _GUIInitNLV: 
     say '_GUIInitNLV started'
+    settings.!helpfile = 0
     CALL NLVSetup
     CALL NLVSetText 'Main', 'Caption', 1
@@ -320 +345 @@
     CALL NLVSetText 'PB_Reload',        'Caption',   11
     CALL NLVSetText 'PB_Reload',        'Hinttext', 111
-    CALL NLVSetText 'PB_Save',        'Caption',   12
-    CALL NLVSetText 'PB_Save',        'Hinttext', 112
+    CALL NLVSetText 'PB_Save',          'Caption',   12
+    CALL NLVSetText 'PB_Save',          'Hinttext', 112
+    CALL NLVSetText 'PB_StartStop',     'Caption',   15
+    CALL NLVSetText 'PB_StartStop',     'Hinttext', 113
     CALL NLVSetText 'PB_Undo',          'Caption',    9
     CALL NLVSetText 'PB_Undo',          'Hinttext', 109
@@ -342 +369 @@
     CALL NLVSetText 'Menu_File_PrintCap',       'Caption',  37
     CALL NLVSetText 'Menu_File_SmbUpdate',      'Caption',  44
+    CALL NLVSetText 'Menu_File_YumInstall',     'Caption',  99
     CALL NLVSetText 'Menu_File_Exit',           'Caption',  27
 
@@ -500 +528 @@
 */
 _MasterPasswdCreate: 
-    call lineout samba.!masterpasswd, '# Created by SSCC ver. 'word(VRGet("Main","Hinttext"),2) 
+    call lineout samba.!masterpasswd, '# Created by 'VRParseFileName(OurINI,'N')' Ver. 'word(VRGet("Main","Hinttext"),2) 
     call lineout samba.!masterpasswd, '# syntax:'
     call lineout samba.!masterpasswd, '# username:passwd:UID:GID:login-class:chg pw x sec:deact x sec:GECOS:home:shell'
-    call lineout samba.!masterpasswd, 'root:*:0:513::0:0:root:/nonexistent:/usr/sbin/nologin'
+    call lineout samba.!masterpasswd, 'root:*:0:512::0:0:root:/nonexistent:/usr/sbin/nologin'
     call lineout samba.!masterpasswd, 'guest:*:65534:65534::0:0:guest:/nonexistent:/usr/sbin/nologin'
     ok = stream(samba.!masterpasswd,'c','close')
+return
+
+/*:VRX         _MasterPasswdFindUser
+*/
+_MasterPasswdFindUser: procedure expose username.
+    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'arg(1)'") started'
+    FindUser = arg(1)
+    Idx = 0
+    do I = 1 to username.0
+        if translate(username.I) = translate(FindUser) then do
+            Idx = I
+            leave
+        end
+    end
+    IF options.!debug == 1 THEN say '_MasterpasswdFindUser("'FindUser'") done, returning 'Idx
+return idx
+/*:VRX         _MasterPasswdRead
+*/
+_MasterPasswdRead: 
+    IF options.!debug == 1 THEN say '_MasterpasswdRead() started'
+    /* Read complete master.passwd */
+    I = 0
+
+    do until lines(samba.!masterpasswd) = 0
+        userline = strip(linein(samba.!masterpasswd))
+    
+        /* Skip comments */
+        if left(userline,1) = "#" then iterate
+        if left(userline,1) = ";" then iterate  
+
+        /* parse fields into stem variables */
+        I = I + 1
+        parse var userline username.I':'password.I':'uid.I':'gid.I':'LoginClass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
+
+        Status.I =""    
+        do J = 1 to I - 1
+            if translate(Username.J) = translate(Username.I) then do
+                status.I = "DUPLICATE"
+                leave
+            end
+        end
+    end
+    ok = stream(samba.!masterpasswd,'c','close')
+    drop userline
+
+    /* set "stem roots" properly */
+    username.0  = I
+    password.0  = I
+    uid.0       = I
+    gid.0       = I
+    loginclass.0= I
+    pwchange.0  = I
+    deact.0     = I
+    gecos.0     = I
+    home.0      = I
+    shell.0     = I
+
+    /* also smbpasswd stems */
+    lmhash. = ''
+    nthash. = ''
+    flags.  = ''
+    lct.    = ''
+    lmhash.0 = I
+    nthash.0 = I 
+    flags.0  = I 
+    lct.0    = I 
+
+    /* smbusermap stem */
+    MapTo. = ''
+    MapTo.0 = I
+
+    /* our private stem */
+    status.0 = I
+    IF options.!debug == 1 THEN say '_MasterpasswdRead() done, read 'username.0' users'
+return
+
+/*:VRX         _MasterPasswdWrite
+*/
+_MasterpasswdWrite: 
+    IF options.!debug == 1 THEN say "_MasterpasswdWrite() started"
+    newmasterpasswd = TempDir'master.passwd'
+
+    ok = SysFileDelete(newmasterpasswd)
+
+    call lineout newmasterpasswd, '# Created by 'VRParseFileName(OurINI,'N')' Ver. 'word(VRGet("Main","Hinttext"),2) 
+    call lineout newmasterpasswd, '# syntax:'
+    call lineout newmasterpasswd, '# username:passwd:UID:GID:login-class:chg pw x sec:deact x sec:GECOS:home:shell'
+
+    do I = 1 to username.0
+        select 
+            when Status.I = "DUPLICATE" & settings.!FixErrors = 1 then iterate
+            when Status.I = "UID MISMATCH" then do
+                call lineout newmasterpasswd, username.I':'password.I':'word(uid.I,1)':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
+            end
+            when Status.I = "UNIX MISSING" & settings.!FixErrors then do
+                call lineout newmasterpasswd, username.I':'password.I':'uid.I':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
+            end
+            otherwise call lineout newmasterpasswd, username.I':'password.I':'uid.I':'gid.I':'loginclass.I':'pwchange.I':'deact.I':'gecos.I':'home.I':'shell.I
+        end
+    end
+    ok = stream(newmasterpasswd,'c','close')
+    ok = VRCopyFile( samba.!masterpasswd, samba.!masterpasswd'.bak' )
+    ok = VRCopyFile( newmasterpasswd, samba.!masterpasswd )
+    ok = SysFileDelete(newmasterpasswd)
+    IF options.!debug == 1 THEN say "_MasterpasswdWrite() done"
 return
 
@@ -796 +929 @@
     ok = stream(pwdfile,"c","close")
 
+    /* update Master.passwd and (s)pwd.db */
+    call _MasterPasswdRead
+    nx = _MasterPasswdFindUser("root")
+
+    call rxFuncAdd "Crypt", "RxCrypt", "RxCrypt"
+
+    itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"
+    salt   = ""
+    do i = 1 to 8
+        salt = salt || substr( itoa64, random( 0, 63 ) + 1, 1 )
+    end
+    password.nx = Crypt(VRGet("EF_RootPassword","Value"), salt )
+
+    /* we need this otherwise _MasterPasswdWrite does not work */
+    settings.!FixErrors = 1
+    call _MasterPasswdWrite
+    call _PasswordDbRewrite
+
     /* Create the root account */
     IF options.!debug == 1 THEN say '  'samba.!smbpasswdexe' -a root -s <'pwdfile
@@ -806 +957 @@
     ok = SysFileDelete(pwdfile)
 
+
+
     /* Deal with swat */
-    /* FixMe: We do not need htpasswd.exe anymore as we use rxcrypt.dll */
+    /* We could use rxcrypt.dll however htpasswd.exe (at least in theory) is more flexible regarding encryption */
     if swatauth then do
         /* we always remove the old swat */
@@ -822 +975 @@
     IF options.!debug == 1 THEN say "_SambaRootPWSet() done"
 return
-
 /*:VRX         _SambaShowError
 */
@@ -863 +1015 @@
 */
 _SambaUserCreate: 
-    eCSUser  = value("USER",,"OS2ENVIRONMENT")
-    HostName = value("HOSTNAME",,"OS2ENVIRONMENT")
-    if translate(eCSUser) = translate(Hostname) then do
-        Msg.Text = NLVGetMessage(118, eCSUser)
-        Msg.Type = "I"
-        call _ShowMsg
-    end
+    eCSUser = value("USER",,"OS2ENVIRONMENT")
     if translate(eCSUser) <> "root" & translate(eCSUser) <> "guest" then do
         Msg.Text = NLVGetMessage(75, eCSUser)
@@ -968 +1114 @@
 */
 _SharesReset: 
-    say '_SharesReset started'
+    call _debuglog '_SharesReset() started'
     ok = VRset("EF_path", "Value","")
     ok = VRFlush( , "EF_path" ) 
@@ -980 +1126 @@
         ok = VRDestroy(CreatedObjs.I)      
     end
-    say '_SharesReset done'
+    call _debuglog '_SharesReset() done'
 return
 
@@ -1030 +1176 @@
         if pos("idmap uid",smbline) > 0 then iterate
         if pos("idmap gid",smbline) > 0 then iterate
-        if pos("idmap config",smbline) > 0 then iterate
         if pos("winbind separator",smbline) > 0 then iterate
         if pos("copy ",smbline) > 0 then iterate
@@ -1046 +1191 @@
 */
 _SmbConfCreateDefault: 
+    call _debuglog "_SmbConfCreateDefault() started"
     ok = SysFileDelete(smbconf)
     
@@ -1059 +1205 @@
     call _SmbConfDefault_ShareDrives
     ok = stream(smbconf,'c','close')
+    call _debuglog "_SmbConfCreateDefault() done"
 return
 
@@ -1120 +1267 @@
 */
 _SmbConfDefault_Global: 
+    call _debuglog "_SmbConfDefault_Global() started"
     Migrate = (arg(1) = 1)
     if \Migrate then do /* when migrating these 4 lines are there already */
         section       = '[global]'
         call lineout smbconf, section 
-        call lineout smbconf, Indent||'workgroup = 'VRGet("EF_Workgroup_Initial","value")
+        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)'
@@ -1130 +1278 @@
     end
 
-    call lineout smbconf, Indent||'dos charset = IBM-850'
-    call lineout smbconf, Indent||'display charset = IBM-850'
-    call lineout smbconf, Indent||'unix charset = IBM-850'
+    if SysQueryProcessCodePage() = "850" then do
+        call lineout smbconf, Indent||'dos charset = IBM-850'
+        call lineout smbconf, Indent||'display charset = IBM-850'
+        call lineout smbconf, Indent||'unix charset = IBM-850'
+    end
+    else do
+        call lineout smbconf, Indent||'dos charset = IBM-850'
+        call lineout smbconf, Indent||'display charset = SYSTEM'
+        call lineout smbconf, Indent||'unix charset = SYSTEM'
+    end
 
     CurCP = SysQueryProcessCodePage() 
@@ -1185 +1340 @@
     end 
     ok = stream(smbconf, 'c','close')  
+    call _debuglog "_SmbConfDefault_Global() done"
 return
 /*:VRX         _SmbConfDefault_Homes
@@ -1362 +1518 @@
 */
 _SmbConfLoad: 
-    IF options.!debug == 1 THEN say '_SmbConfLoad() started'
-    IF options.!debug == 1 THEN say '  Loading "'samba.!smbconf'" ('stream(samba.!smbconf,'c','query size')' bytes)'
+    call _debuglog '_SmbConfLoad() started'
+    call _debuglog 'Loading "'samba.!smbconf'" ('stream(samba.!smbconf,'c','query size')' bytes)'
 
 /*  ok = IniEnumSections(sections., samba.!smbconf) */
@@ -1411 +1567 @@
     end 
     ok = VRMethod("CN_smbconf","SetRecordAttr",smbconf.!root, "Collapsed", 0 )
-    IF options.!debug == 1 THEN say '_SmbConfLoad() done'
+    call _debuglog '_SmbConfLoad() done'
 return
 
@@ -1678 +1834 @@
 */
 _SmbConfTreeReset: 
+    call _debuglog '_SmbConfTreeReset() started'
     call _SharesReset
     ok = VRMethod( "CN_SmbConf", "RemoveRecord", smbconf.!root ) 
     call _SmbConfTreeInit
     call _GUIInit
+    call _debuglog '_SmbConfTreeReset() done'
 return
 
@@ -1818 +1976 @@
 
     Ok = VRset("Main", "Painting", 0)
+    ok = VRSet("Main", 'Pointer', 'WAIT' )
     ok = VRset("GB_Help",      "Visible", 0)
     ok = VRset("GB_Global",    "Visible", 0)
@@ -1826 +1985 @@
         IF options.!debug == 1 THEN SAY 'CN_smbconf_Click() aborted, no handle'
         Ok = VRset("Main", "Painting", 1)
+        ok = VRSet("Main", 'Pointer', '<default>' )
         return
     end
@@ -1842 +2002 @@
     call _SharesReset
     Ok = VRset("Main", "Painting", 1)
+    ok = VRSet("Main", 'Pointer', '<default>' )
 
     ok = VRSet("TM_Value", "Enabled", 1)
@@ -1847 +2008 @@
         IF options.!debug == 1 THEN SAY 'CN_smbconf_Click() aborted, got parent handle'
         Ok = VRset("Main", "Painting", 1)
+        ok = VRSet("Main", 'Pointer', '<default>' )
         return
     end
@@ -1862 +2024 @@
 
         Ok = VRset("Main", "Painting", 0)
+        ok = VRSet("Main", 'Pointer', 'WAIT' )
         CurSection = sections.I
         CurSIdx = I
@@ -1880 +2043 @@
                         IF options.!debug == 1 THEN  say '  InsertPage = 'ok
 
-/*                    ok = VRset("Main", "Painting", 1)
+/*                  ok = VRset("Main", "Painting", 1)
+                    ok = VRSet("Main", 'Pointer', '<default>' )
                     Msg.Text = NLVGetMessage(114)
                     Msg.Type = "I"
@@ -1892 +2056 @@
             if \VRIsValidObject("GB_"ActiveGroup) then do
                 ok = VRset("Main", "Painting", 1)
+                ok = VRSet("Main", 'Pointer', '<default>' )
                 Msg.Text = NLVGetMessage(114)
                 Msg.Type = "I"
@@ -1984 +2149 @@
 
                 if ObjYPos > VRGet("GB_Global","Height") - 1200 then do
-                    /* Ok = VRset("Main", "Painting", 1) */
+                 /* Ok = VRset("Main", "Painting", 1) 
+                    ok = VRSet("Main", 'Pointer', '<default>' )*/
                     Page = Page + 1
                     if Page = 2 then do
                         Ok = VRset("Main", "Painting", 1)
+                        Ok = VRset("Main", "Painting", 0)
                         ok = VRSet("Main", 'Pointer', 'Wait' )
-                        Ok = VRset("Main", "Painting", 0)
                     end
                     if \VRIsValidOBject("GL_GLOBAL_"Page) then do
@@ -2138 +2304 @@
 */
 GB_Global_1_Create: 
-    call GB_Global_1_Init   
+    call GB_Global_1_Init
+    SysCP = SysQueryProcessCodePage()
+    ok = VRMethod( "EF_unix_charset",    "AddString", "IBM-"SysCP, 2)
+    ok = VRMethod( "EF_display_charset", "AddString", "IBM-"SysCP, 2)
+    if pos("IBM-"SysCP, VRGet( "EF_dos_charset","InitialList")) = 0 then do
+        ok = VRMethod( "EF_dos_charset", "AddString", "IBM-"SysCP, 2) 
+    end
 return
 
@@ -2320 +2492 @@
     IF options.!debug == 1 THEN SAY "Main_Resize() started"
     Ok = VRset("Main", "Painting", 0)
-
-   /*  /* Basic measurements */
-    main_iwidth  = VRGet("Main","InteriorWidth")                /* Width of window client-area */
-    main_iheight = VRGet("Main","InteriorHeight")               /* Height of window client-area */
-
-    if main_iheight < 5500 then ok = VRSet("Main","Height",6200)
-    sbar_height  = VRGet("GB_STATUSBAR","Height")               /* Height of status-bar */
-    split_left   = VRGet("SPLIT_Main","Left")                   /* Position of the left edge of the split-bar */
-    marginx2     = margin * 2                                   /* Common margin around controls */
-    pbtn_height  = 400                                          /* Height of the panels' internal button areas */
-
-    pane_height  = main_iheight - sbar_height - (margin * 4)    /* Height of a split-bar panel */
-    lpane_width  = split_left - margin                          /* Width of the left split-bar panel */
-    rpane_width  = main_iwidth - split_left - 60 - margin       /* Width of the right split-bar panel */ */
-
-    /* ab hier alt */
     ok = VRSet("GB_SmbConfTree","Top",    FWidth)
     ok = VRSet("GB_SmbConfTree","Left",   FWidth-24)
-    ok = VRSet("GB_SmbConfTree","Height", VRGet("Main", "Height") -1350)
+    ok = VRSet("GB_SmbConfTree","Height", VRGet("Main", "Height") -1400)
 
     ok = VRset("GB_SmbConfTree3","Top",     FWidth)
@@ -2408 +2564 @@
 
     if MButton.bTop < 1300 & MButton.bLeft < 1300 then do
-        MButton.bTop = 4842
+        MButton.bTop = 4802
         MButton.bLeft = 3758
         MButton.bWidth = 1241
@@ -2414 +2570 @@
     end
 
-    ok = VRSet("PB_Reload", "Top",    MButton.bTop)
-    ok = VRSet("PB_Reload", "Left",   MButton.bLeft)
+    ok = VRSet("PB_Reload",   "Top",    MButton.bTop)
+    ok = VRSet("PB_Reload",   "Left",   VRGet("GB_SmbConfTree","Left"))
+    ok = VRSet("PB_Reload",   "Width",  MButton.bWidth)
+
+    ok = VRSet("PB_StartStop","Top",    MButton.bTop)
+    ok = VRSet("PB_StartStop","Left",   VRGet("GB_SmbConfTree","Width")-MButton.bWidth-FWidth)
+    ok = VRSet("PB_StartStop","Width",  MButton.bWidth)
+
+    ok = VRSet("PB_Save",   "Top",    MButton.bTop)
+    ok = VRSet("PB_Save",   "Left",   MButton.bLeft)
     ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
 
-    ok = VRSet("PB_Save", "Top",    MButton.bTop)
-    ok = VRSet("PB_Save", "Left",   MButton.bLeft+1*FWidth+MButton.bWidth)
-    ok = VRSet("PB_Reload", "Width",  MButton.bWidth)
-
     ok = VRSet("PB_Undo",   "Top",    MButton.bTop)
-    ok = VRSet("PB_Undo",   "Left",   MButton.bLeft+2*FWidth+MButton.bWidth*2)
+    ok = VRSet("PB_Undo",   "Left",   MButton.bLeft+2*FWidth+MButton.bWidth*1)
     ok = VRSet("PB_Undo",   "Width",  MButton.bWidth)
+
+    ok = VRSet("PB_Help",   "Top",    MButton.bTop)
+    ok = VRSet("PB_Help",   "Left",   MButton.bLeft+6*FWidth+MButton.bWidth*2)
+    ok = VRSet("PB_Help",   "Width",  MButton.bWidth)
 
     ok = VRSet("PB_Cancel", "Top",    MButton.bTop)
@@ -2430 +2594 @@
     ok = VRSet("PB_Cancel", "Width",  MButton.bWidth)
 
- /* ok = VRSet("PB_Help",   "Top",    MButton.bTop)
-    ok = VRSet("PB_Help",   "Left",   MButton.bLeft+6*FWidth+MButton.bWidth*3)
-    ok = VRSet("PB_Help",   "Width",  MButton.bWidth) */
 
     drop MButton.b
@@ -2572 +2733 @@
 */
 Menu_File_reset_Click: 
+    say "Menu_File_reset_Click() started"
     call _SmbConfCreateDefault
     ok = SysFileTree(smbconf,exist.,'FO')
     SmbConfExists = exist.0
     call _SmbConfTreeReset
+    say "Menu_File_reset_Click() done"
 return
 
@@ -2597 +2760 @@
 return
 
+/*:VRX         Menu_File_YumInstall_Click
+*/
+Menu_File_YumInstall_Click: 
+    address cmd 'yum install libc libcx libgcc1 cups-libs popt-libs gettext-libs zlib readline'
+return
+
 /*:VRX         Menu_Help_About_Click
 */
@@ -2613 +2782 @@
 Menu_Options_ExportMode_Click: 
     say 'ExpertMode_Click started'
-    say         samba.!testparmexe' -v -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
-    address cmd samba.!testparmexe' -v -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
+    ok = VRSet("Main", 'Pointer', 'WAIT' )
+    log_level    = IniGet('log level',    'global', samba.!smbconf)
+    if datatype(log_level) <> "NUM" then log_level = 2
+    say         samba.!testparmexe' -v -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
+    address cmd samba.!testparmexe' -v -s -d='log_level' 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
     say 'VRCopyFile('TempDir'smb.conf, 'smbconf' )'
     say "  smb.conf GrӇe: "stream(smbconf,'c','QUERY SIZE')
@@ -2622 +2794 @@
     call _SmbConfTreeReset
     call Main_Resize
+    ok = VRSet("Main", 'Pointer', '<default>' )
     say 'ExpertMode_Click done'
 return
@@ -2636 +2809 @@
 */
 Menu_Options_SimpleMode_Click: 
-    say 'SimpleMode_Click started'
-
+    call _debuglog 'Menu_SimpleMode_Click() started'
+    ok = VRSet("Main", 'Pointer', 'WAIT' )
     /* Workaround for testparm bugs */
     say 'VRCopyFile('smbconf', 'TempDir'smb.conf )'
     ok = VRCopyFile( smbconf, TempDir'smb.conf')
     call _SmbConfCommitChanges
-
-    say samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
-    address cmd samba.!testparmexe' -s 1>'TempDir'smb.conf 2>'TempDir'sscc.testparm'
+    log_level    = IniGet('log level',    'global', samba.!smbconf)
+    if datatype(log_level) <> "NUM" then log_level = 2
+    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'
     NewSize = stream(TempDir"smb.conf",'c','QUERY SIZE')
     say "  "TempDir"smb.conf GrӇe: "NewSize
@@ -2654 +2828 @@
     say 'Copy ok ='ok' (1 = success, 0 = failure)'
     call _SmbConfTreeReset
-    do I = Page to 3 by -1 
-        ok = VRMethod( "GB_Global", "DeletePage", I  ) 
-        ok = VRDestroy("GL_GLOBAL_"I)
+
+    if datatype(Page) = "NUM" then do
+        do I = Page to 3 by -1
+            ok = VRMethod( "GB_Global", "DeletePage", I  ) 
+            ok = VRDestroy("GL_GLOBAL_"I)
+        end
     end
     Page = 2
     call Main_resize
-say 'SimpleMode_Click done'
+    ok = VRSet("Main", 'Pointer', '<>default' )
+    call _debuglog 'Menu_SimpleMode_Click() done'
 return
 
@@ -2804 +2982 @@
     IF options.!debug == 1 THEN say 'PB_Cancel_Click() started'    
     if VRGet("PB_Save","Enabled") then call PB_Save_Click
-'pause'
     call Quit
     IF options.!debug == 1 THEN say 'PB_Cancel_Click() done'    
@@ -2927 +3104 @@
         call _LMHostsImport
     end
-
+    if VRGet("CB_YumInstall","set") then do
+        call Menu_File_YumInstall_Click
+    end
     call RemoveConfig_Close
 return
@@ -2950 +3129 @@
     call PB_Save_Click    
     call beep 960, 1
-    address CMD samba.!smbcmd' reload'
+    if _SambaRunning() then do
+        address CMD samba.!smbcmd' stop'
+        ok = VRSet("PB_StartStop", "BackColor", "Green")
+        ok = VRSet("PB_StartStop", "Caption", startst)
+    end
+    else do
+        address CMD samba.!smbcmd' start'
+        ok = VRSet("PB_StartStop", "BackColor", "Red")    
+        ok = VRSet("PB_StartStop", "Caption", stopst)
+    end
 return
 
@@ -3071 +3259 @@
     ok = VRset("CB_RemoveBackend","Caption", NLVGetMessage(56, 'Backend'))
     ok = VRset("CB_RemoveLMHosts","Caption", NLVGetMessage(56, 'lmhosts'))
+    ok = VRset("CB_YumInstall","Caption", NLVGetMessage(99))
 
     /* Check if ?db backend files exist */