Changeset 897

Timestamp:

Mar 21, 2016, 2:18:50 PM (5 years ago)

Author:

Herwig Bauernfeind

Message:

smb.cmd: Fix crash on uninterpretable smb.conf parm

Location:

branches/scripts/smb_init

Files:

• b4smb.cmd (modified) (4 diffs)
• smb.cmd (modified) (2 diffs)

branches/scripts/smb_init/b4smb.cmd

@@ -11 +11 @@
  */
 
-ArchLogs = 1 /* Move previous logfiles to archive (by Yuri Dario) */
-DelLogs  = 0 /* Remove previous logfiles only */
-KeepGens = 5 /* Keep last 5 generations of log files, 0 = all */
-SaveCfg  = 1 /* Save a snapshot of the current Samba configuration */
-DelTDBs  = 1 /* Remove transient .tdb files */
-DHCPWait = 1 /* wait until an address was obtained by the DHCP server */
+ArchLogs =  1 /* Move previous logfiles to archive (by Yuri Dario) */
+DelLogs  =  0 /* Remove previous logfiles only */
+KeepGens = 10 /* Keep last 10 generations of log files, 0 = all */
+SaveCfg  =  1 /* Save a snapshot of the current Samba configuration */
+DelTDBs  =  1 /* Remove transient .tdb files */
+DHCPWait =  1 /* wait until an address was obtained by the DHCP server */
 
 /* Setup places */
@@ -28 +28 @@
 if ArchLogs = 1 then do /* Creative logfile archive */
     ok = SysMkDir(SMB_LOGS'\Archive')
-    Archive = SMB_LOGS||'\Archive\'||date('s')||'-'||translate(time('n'),'-',':')||".zip"
+    Archive = SMB_LOGS||'\Archive\logarc-'||date('S')'-'right('0'||time('M'),4)
     address cmd' zip -jmo9 'Archive' 'SMB_LOGS'\log.?mbd* 'SMB_LOGS'\log.winb*'
     if KeepGens > 0 then do /* Eventually purge old logfile archives */
-        ok = SysFileTree(SMB_LOGS||'\Archive\*.zip',logarchs.,"FO")
+        ok = SysFileTree(SMB_LOGS||'\Archive\logarc*.zip',logarchs.,"FO")
         if logarchs.0 > KeepGens then do
             do I = 1 to (logarchs.0-KeepGens)
@@ -50 +50 @@
     ok = SysMkDir(ETC'\SmbBackup')
     Backup = ETC'\SmbBackup\smbcfg-'date('S')'-'right('0'||time('M'),4)
-    address cmd' zip -rpo9 'Backup' 'ETC'\samba\* 'UNIXETC'\*pwd* 'UNIXETC'\*passw* -x 'ETC'\samba\*.zip >SmbBackup'
+    address cmd' zip -rpo9 'Backup' 'ETC'\samba\* 'UNIXETC'\*pwd* 'UNIXETC'\*passw* -x 'ETC'\samba\*.zip 'ETC'\samba\log\log* >SmbBackup'
+    if KeepGens > 0 then do /* Eventually purge old snapshots */
+        ok = SysFileTree(ETC'\SmbBackup\smbcfg-*',snapshots.,"FO")
+        if snapshots.0 > KeepGens then do
+            do I = 1 to (snapshots.0-KeepGens)
+                address cmd' del "'snapshots.I
+            end
+        end
+    end
 end
 
@@ -73 +81 @@
 end
 
-if WaitDHCP then do /* Make sure we got network interfaces up and running */
+if DHCPWait then do /* Make sure we got network interfaces up and running */
     address cmd' dhcpstrt'
 end

branches/scripts/smb_init/smb.cmd

@@ -1 @@
-/* Samba Server for eCS (OS/2) init script Version 3.1.8
-   Copyright (C) netlabs.org 2007-2012
+/* Samba Server for eCS (OS/2) init script Version 3.1.9
+   Copyright (C) bww bitwise works GmbH. 2007-2016
 
    This program is free software; you can redistribute it and/or modify
@@ -517 +517 @@
             istr = sections.s'.0='p
             interpret istr
-            nextone:
-        end
-    end
+        end
+        nextone:
+        signal on syntax name endloop
+    end
+    endloop:
     ok = stream(samba.!smbconf,'c','close')
 return 0