Changeset 844 for branches

Timestamp:

Feb 12, 2014, 4:25:35 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

smb.cmd 3.1.8: Support for several options introduced in Samba 3.6, fix Ticket #235

Location:

branches/scripts/smb_init

Files:

• b4smb.cmd (modified) (1 diff)
• smb.cmd (modified) (5 diffs)

branches/scripts/smb_init/b4smb.cmd

@@ -1 @@
-/* B4SMB.CMD */
+/* 
+  Samba Server for eComStation (OS/2) tools
+  
+  (c) 2007-2014 Herwig Bauernfeind for bww bitwise works GmbH.
+  Script:  B4SMB.CMD, requires REXX.
+  Purpose: This script is executed before the Samba daemons are actually 
+           started. You may put arbitrary tasks in here. There are several 
+           task templates implemented using status flags - set to 1 to enable
+           the feature, or any other value to disable the feature
+  Syntax:  No parameters.
+ */
+
+ArchLogs = 1 /* Move previous logfiles to archive (by Yuri Dario) */
+DelLogs  = 0 /* Remove previous logfiles only */
+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 */
+ETC      = value("ETC",,"OS2ENVIRONMENT")
+UNIXETC  = value("UNIXROOT",,"OS2ENVIRONMENT")'\etc'
+SMB_LOGS = value("SMB_LOGS",,"OS2ENVIRONMENT")
+SMB_LOCK = value("SMB_LOCK",,"OS2ENVIRONMENT")
+
 '@echo off'
 
-/* This script is executed before the Samba daemons are actually started
-   You may put arbitrary tasks in here. There are several task templates
-   in here. Of these only the simple removal of previous logfiles is 
-   enabled by default */
-   
-SMB_LOGS = value("SMB_LOGS",,"OS2ENVIRONMENT")
+if ArchLogs = 1 then do /* Creative logfile archive */
+    ok = SysMkDir(SMB_LOGS'\Archive')
+    Archive = SMB_LOGS||'\Archive\'||date('s')||'-'||translate(time('n'),'-',':')||".zip"
+    address cmd' zip -jmo9 'Archive' 'SMB_LOGS'\log.?mbd* 'SMB_LOGS'\log.winb*'
+end
 
-/* Remove previous logfiles only */
-say 'Removing previous logfiles'
-address cmd' del 'SMB_LOGS'\log.?mbd* 2>NUL'
-address cmd' del 'SMB_LOGS'\log.winb* 2>NUL'
+if DelLogs = 1 then do /* Remove previous logfiles only */
+    say 'Removing previous logfiles'
+    address cmd' del 'SMB_LOGS'\log.?mbd* 2>NUL'
+    address cmd' del 'SMB_LOGS'\log.winb* 2>NUL'
+end
 
-/* Yuri Darios Logfile archiving feature */
-/*
-ok = SysMkDir(SMB_LOGS'\Archive')
-Archive = SMB_LOGS||'\Archive\'||date('s')||'-'||translate(time('n'),'-',':')||".zip"
-'zip -jmo9 'Archive' 'SMB_LOGS'\log.?mbd* 'SMB_LOGS'\log.winb*'
- */
 
-/* Removal of transient tdb files feature
-   Caution! Do not enable these, unless you know what you are doing! */
+if SaveCfg = 1 then do /* Take config snapshot */
+    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'
+end
 
-/*    
-ok = SysFileDelete(SMB_LOCK||'\gencache.tdb')
-ok = SysFileDelete(SMB_LOCK||'\brlock.tdb')
-ok = SysFileDelete(SMB_LOCK||'\unexpected.tdb')
-ok = SysFileDelete(SMB_LOCK||'\connections.tdb')
-ok = SysFileDelete(SMB_LOCK||'\locking.tdb')
-ok = SysFileDelete(SMB_LOCK||'\messages.tdb')
- */
+
+if DelTDBs = 1 then do /* remove transient .tdb files */
+    /* Documentation:
+       http://www.samba.org/samba/docs/man/Samba-HOWTO-Collection/tdb.html 
+     */
+    ok = SysFileDelete(SMB_LOCK||'\brlock.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\browse.dat')
+    ok = SysFileDelete(SMB_LOCK||'\connections.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\gencache.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\locking.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\login_cache.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\messages.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\sessionid.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\unexpected.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\winbindd_cache.tdb')
+    ok = SysFileDelete(SMB_LOCK||'\wins.dat')
+    /* Do not remove wins.tdb unless it is damaged */
+    ok = SysFileDelete(SMB_LOCK||'\wins.tdb')
+end
+
+if WaitDHCP then do /* Make sure we got network interfaces up and running */
+    address cmd' dhcpstrt'
+end
 
 say 'b4smb done.'

branches/scripts/smb_init/smb.cmd

@@ -1 @@
-/* Samba Server for eCS (OS/2) init script Version 3.1.7
+/* Samba Server for eCS (OS/2) init script Version 3.1.8
    Copyright (C) netlabs.org 2007-2012
 
@@ -497 +497 @@
         if left(smbline,1) = '[' then do /* new section */
             parse var smbline '['sname']'
-            sname = translate(strip(sname),'_!?',' :$')
+            sname = translate(strip(sname),'__!?',' *:$')
             s = s + 1
             sections.0 = s
@@ -505 +505 @@
         else do /* new parm */
             parse var smbline parm'='pvalue
-            parm = translate(strip(parm),'_!?',' :$')
+            parm = translate(strip(parm),'__!?',' *:$')
             pvalue = strip(pvalue)
             p = p + 1
@@ -511 +511 @@
                 then istr = sname"."parm"='"pvalue"'"
                 else istr = sname'.'parm'="'pvalue'"'
+            signal on syntax name nextone
             interpret istr
             istr = sections.s'.'p'="'parm'"'
@@ -516 +517 @@
             istr = sections.s'.0='p
             interpret istr
+            nextone:
         end
     end