Changeset 283 for branches/scripts/smb_init

Timestamp:

Jun 24, 2009, 2:42:01 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

smb.cmd: Check if master.passwd exists, give hints in case of error

Location:

branches/scripts/smb_init

Files:

• readme.smb_init (modified) (3 diffs)
• smb.cmd (modified) (5 diffs)

branches/scripts/smb_init/readme.smb_init

@@ -1 @@
-Samba Server for eCS (OS/2) init script Version 3.0.3
+Samba Server for eCS (OS/2) init script Version 3.1.0
 =====================================================
 
@@ -26 +26 @@
 smb {start|stop|restart|reload|status|test}
 
-In addition a plugin feature found in IBM's TCPSTART.CMD is present in
-smb.cmd:
+In addition a similar plugin feature found in IBM's TCPSTART.CMD is present
+in smb.cmd:
 
 - If a file named B4SMB.CMD is found in the Samba directory, it will be run
@@ -35 +35 @@
   after the Samba services have been stopped.
 
-smb.cmd is also used by SWAT and smbmon.exe to start or stop the Samba daemons
+smb.cmd is also used by SWAT and smbmon.exe to start or stop the Samba daemons.
 
 In addition Samba daemons that refuse to stop peacefully are killed using 

branches/scripts/smb_init/smb.cmd

@@ -1 @@
-/* Samba Server for eCS (OS/2) init script Version 3.0.4
+/* Samba Server for eCS (OS/2) init script Version 3.1.0
    Copyright (C) netlabs.org 2007-2009
 
@@ -60 +60 @@
             say 'Samba services are not running. Aborting...'
             ok = directory(OldDir)
-            exit -3
+            exit -4
         end
         samba.!bin'\smbstatus.exe smbd 2>NUL'
@@ -156 +156 @@
     end
     UnixETC  = UnixRoot'\etc'
+    /* Make sure it exists */
+    ok = SysMkDir(UnixETC)
 
     /* Find out various directories */
@@ -198 +200 @@
     samba.!smbconf = stream(ETC'\samba\smb.conf','c','query exists')
     if samba.!smbconf = "" then do
-        say ETC'\samba\smb.conf is missing. Aborting...'
+        say ETC'\samba\smb.conf is missing.'
+        say 'Try running sscc.exe /install to create it! Aborting...'
         exit -2
+    end
+
+    /* Check if kLIBC password files exist */
+    samba.!masterpasswd = stream(unixetc'\master.passwd','c','query exists')
+    if samba.!masterpasswd = "" then do
+        say unixetc'\master.passwd is missing.'
+        say 'Try running sscc.exe /install to create it! Aborting...'
+        exit -3
+    end
+
+    samba.!pwddb = stream(unixetc'\pwd.db','c','query exists')
+    if samba.!pwddb = "" then do
+        say unixetc'\pwd.db is missing.'
+        say 'Try running usermod to create it. Aborting...'
+        exit -3
+    end
+
+    samba.!spwddb = stream(unixetc'\spwd.db','c','query exists')
+    if samba.!spwddb = "" then do
+        say unixetc'\spwd.db is missing.'
+        say 'Try running usermod to create it. Aborting...'
+        exit -3
     end
 
@@ -257 +282 @@
     samba.!lock_dir   = translate(IniGet("lock directory", "global", samba.!smbconf),'\','/')
     samba.!debuglevel = IniGet("log level", "global", samba.!smbconf)
+
+    /* make sure these directories exist */
+    ok = SysMkDir(samba.!log_path)
+    ok = SysMkDir(samba.!lock_dir)
     
     ok = value("SMB_LOGS",samba.!log_path,"OS2ENVIRONMENT")