Changeset 266 for branches/scripts

Timestamp:

Jun 13, 2009, 5:36:52 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

smb.cmd: Add support for Samba 3.3.x

Location:

branches/scripts/smb_init

Files:

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

branches/scripts/smb_init/b4smb.cmd

@@ -4 +4 @@
 /* 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 here. Of these only the simple removal of previous logfiles is 
+   in here. Of these only the simple removal of previous logfiles is 
    enabled by default */
    
@@ -10 +10 @@
 
 /* Remove previous logfiles only */
-say 'Remove previous logfiles'
+say 'Removing previous logfiles'
 address cmd' del 'SMB_LOGS'\log.?mbd* 2>NUL'
 address cmd' del 'SMB_LOGS'\log.winb* 2>NUL'

branches/scripts/smb_init/smb.cmd

@@ -1 @@
-/* Samba Server for eCS (OS/2) init script Version 3.0.2
+/* Samba Server for eCS (OS/2) init script Version 3.0.3
    Copyright (C) netlabs.org 2007-2009
 
@@ -16 +16 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  
 
-   Description: Starts and stops the Samba smbd and nmbd 
+   Description: Starts and stops the Samba smbd, nmbd and winbindd
                 daemons used to provide CIFS/SMB network services.
                 Run without parameter in order to display usage!
@@ -35 +35 @@
 call directory samba.!bin
 
-/* Check if winbindd daemon exists */
-HaveWinbindd = (stream(samba.!bin'\winbindd.exe', 'c', 'query exists') <> "")
-
 /* get the commandline arguments */
 arg UArg Service
 
-/* Samba 3.3.x already supported! */
+/* ALL is valid for Samba 3.3.x or better */
 if Service = "ALL" then Service = "" 
+
+/* Set delay to wait when daemons come up or shutdown */
+options.!delay = 1 /* sec */
 
 if \(Service = "") & \(Service = "SMBD") & \(Service = "NMBD") & \(Service = "WINBINDD") then do
@@ -201 +201 @@
         exit -2
     end
+
+    /* Check if winbindd daemon exists */
+    HaveWinbindd = (stream(samba.!bin'\winbindd.exe', 'c', 'query exists') <> "")
 return
 
@@ -275 +278 @@
 
     if running.!smbd = 1 & (svc = "SMBD" | svc = "") then do
-        'smbcontrol smbd shutdown >' samba.!log_path'\log.smbd.shtdn 2>&1'
-        ok = SysFileDelete(ETC'\samba\pid\smbd.pid')
-        ok = SysSleep(0.1)
+        samba.!bin'\smbcontrol.exe smbd shutdown >' samba.!log_path'\log.smbd.shtdn 2>&1'
+        ok = SysFileDelete(ETC'\samba\pid\smbd*pid')
+        ok = SysSleep(options.!delay)
         ok = _SambaRunning()
         if words(pids.!smbd) > 0 then do I = 1 to words(pids.!smbd)
-            call charout ,"Trying to kill smbd.exe PID "word(pids.!smbd,I)
+            call charout ,"Killing smbd.exe PID "word(pids.!smbd,I)
             ok = PRKillProcess("1", word(pids.!smbd,I))
             if ok = 0 then say ", success!"; else say ", error "ok
@@ -287 +290 @@
 
     if running.!nmbd = 1 & (svc = "NMBD" | svc = "") then do
-        'smbcontrol nmbd shutdown >' samba.!log_path'\log.nmbd.shtdn 2>&1'
-        ok = SysFileDelete(ETC'\samba\pid\nmbd.pid')
-        ok = SysSleep(0.1)
+        samba.!bin'\smbcontrol.exe nmbd shutdown >' samba.!log_path'\log.nmbd.shtdn 2>&1'
+        ok = SysFileDelete(ETC'\samba\pid\nmbd*pid')
+        ok = SysSleep(options.!delay)
         ok = _SambaRunning()
         if words(pids.!nmbd) > 0 then do I = 1 to words(pids.!nmbd)
-            call charout ,"Trying to kill nmbd.exe "word(pids.!nmbd,I)
+            call charout ,"Killing nmbd.exe PID "word(pids.!nmbd,I)
             ok = PRKillProcess("1", word(pids.!nmbd,I))
             if ok = 0 then say ", success!"; else say ", error "ok
@@ -299 +302 @@
 
     if running.!winb = 1 & (svc = "WINBINDD" | svc = "") then do
-        'smbcontrol winbindd shutdown >' samba.!log_path'\log.winbindd.shtdn 2>&1'
-        ok = SysFileDelete(ETC'\samba\pid\winbindd.pid')
-        ok = SysSleep(0.1)
+        samba.!bin'\smbcontrol.exe winbindd shutdown >' samba.!log_path'\log.winbindd.shtdn 2>&1'
+        ok = SysFileDelete(ETC'\samba\pid\winbindd*pid')
+        ok = SysSleep(options.!delay)
         ok = _SambaRunning()
         if words(pids.!winb) > 0 then do I = 1 to words(pids.!winb)
-            call charout ,"Trying to kill winbindd "word(pids.!winb,I)
+            call charout ,"Killing winbindd PID "word(pids.!winb,I)
             ok = PRKillProcess("1", word(pids.!winb,I))
             if ok = 0 then say ", success!"; else say ", error "ok
         end
     end
-    ok = SysSleep(0.2)
+    ok = SysSleep(options.!delay)
     if \_SambaRunning() then say Green||"Samba "samba.!version" services stopped successfully."||Normal
     else do
@@ -367 +370 @@
     if running.!smbd = 0 & (svc = "SMBD" | svc = "") then do
         /* Just to be sure - this pid file should not be there anyway! */
-        ok = SysFileDelete(ETC'\samba\pid\smbd.pid')
+        ok = SysFileDelete(ETC'\samba\pid\smbd*pid')
         ok = charout(, '  SMBD:     ')
-        'detach smbd'
+        'detach 'samba.!bin'\smbd' /* Do not add .exe here!!! */
     end
     if running.!nmbd = 0 & (svc = "NMBD" | svc = "") then do
         /* Just to be sure - this pid file should not be there anyway! */    
-        ok = SysFileDelete(ETC'\samba\pid\nmbd.pid')
+        ok = SysFileDelete(ETC'\samba\pid\nmbd*pid')
         ok = charout(, '  NMBD:     ')
-        'detach nmbd -l 'samba.!log_path' -d 'samba.!debugLevel
+        'detach 'samba.!bin'\nmbd -l 'samba.!log_path' -d 'samba.!debugLevel
     end
     if haveWinbindd & running.!winb = 0 & (svc = "WINBINDD" | svc = "") then do
         /* Just to be sure - this pid file should not be there anyway! */    
-        ok = SysFileDelete(ETC'\samba\pid\winbindd.pid')
+        ok = SysFileDelete(ETC'\samba\pid\winbindd*pid')
         ok = charout(, '  WINBINDD: ')
-        'detach winbindd -l 'samba.!log_path' -d 'samba.!debugLevel
-    end
-    ok = SysSleep(0.3)
+        'detach 'samba.!bin'\winbindd -l 'samba.!log_path' -d 'samba.!debugLevel
+    end
+    ok = SysSleep(options.!delay)
     if svc = "" then do
         if _SambaRunning("ALL") then say Green||"Samba "samba.!version" services started successfully."||Normal
@@ -453 +456 @@
 return 0
 
-IniGet: /* Replacement IniGet routine to access the value a known parameter */
-    iparm = translate(arg(1),'_',' ')
+IniGet: /* Replacement IniGet routine to access the value of a known 
+           parameter */
+    iparm = translate(arg(1),'_!',' :')
     isection = arg(2)
     /* Third parameter is ignored, as the file is not required here */
@@ -461 +465 @@
     /* Deal with empty/non existing parameters */
     if ivalue = translate(isection'.'iparm) then ivalue = ''
-return ivalue    
+return ivalue