Changeset 283 for branches/scripts

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

Files:

• group/groupmod.cmd (modified) (4 diffs)
• smb_init/readme.smb_init (modified) (3 diffs)
• smb_init/smb.cmd (modified) (5 diffs)
• user/usermod.cmd (modified) (4 diffs)

branches/scripts/group/groupmod.cmd

@@ -1 +1 @@
 /* GroupMod script for Samba Server for eCS (OS/2) */
-   Version = '2.1.3'
+   Version = '2.2.0'
 /* Copyright (C) netlabs.org 2007-2009
 
@@ -37 +37 @@
 call _SambaInit
 
+call _SambaExtendSearchPath
+
 parse arg '-'mode' "'group'"'
 if group = "" & mode <> "" then parse arg '-'mode' 'group
@@ -140 +142 @@
     script = VRParseFileName(script,'N')
 
+    /* smbd.exe */
+    samba.!smbd = ""
+    if samba.!smbd = "" then do /* in current directory? */
+        ok = SysFileTree('.\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in parent directory? */
+        ok = SysFileTree('..\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in ..\BIN directory? */
+        ok = SysFileTree('..\bin\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in SMB_EXE ? */
+        samba.!smbd = SysSearchPath("SMB_EXE","SMBD.EXE")
+    end
+    if samba.!smbd = "" then do /* in PATH ? */
+        samba.!smbd = SysSearchPath("PATH","SMBD.EXE")
+    end
+
+    samba.!bin = VRParseFileName(samba.!smbd,'DP')
+    if samba.!bin = "" then samba.!bin = samba.!tools
+
     samba.!pwd_mkdb = SysSearchPath("PATH","pwd_mkdb.exe")
     if samba.!pwd_mkdb = "" then do /* in current directory? */
@@ -156 +182 @@
         samba.!pwd_mkdb = SysSearchPath("SMB_SBIN","pwd_mkdb.exe")
     end
+return
+
+_SambaExtendSearchPath:
+    /* Add binary and tools path to the PATH variable */
+    old_path = value('PATH',, 'OS2ENVIRONMENT')
+    if pos(translate(samba.!bin';'),translate(old_path)) = 0 then do
+        if samba.!bin = samba.!tools then new_path = samba.!bin';'
+        else new_path = samba.!bin';'samba.!tools';'
+        ok = value('PATH', new_path || old_path, 'OS2ENVIRONMENT')
+        drop new_path
+    end
+    drop old_path
+    
+    /* Add binary and tools path to the BEGINLIBPATH variable */
+    old_beginlibpath = SysQueryExtLibPath("B")
+    if pos(translate(samba.!bin';'),translate(old_beginlibpath)) = 0 then do
+        if samba.!bin = samba.!tools then new_beginlibpath = samba.!bin';'old_beginlibpath
+        else new_beginlibpath = samba.!bin';'samba.!tools';'old_beginlibpath
+        ok = SysSetExtLibPath( new_beginlibpath, "B")
+        drop new_beginlibpath
+    end
+    drop old_beginlibpath
 return
 

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")

branches/scripts/user/usermod.cmd

@@ -1 +1 @@
 /* UserMod script for Samba Server for eCS (OS/2) */
-   Version = '2.1.5'
+   Version = '2.2.0'
 /* Copyright (C) netlabs.org 2007-2009
 
@@ -36 +36 @@
 call _SambaInit
 
+call _SambaExtendSearchPath
+
 parse arg '-'mode' "'User'"'
 if User = "" & mode <> "" then parse arg '-'mode' 'User
@@ -163 +165 @@
     script = VRParseFileName(script,'N')
 
+    /* smbd.exe */
+    samba.!smbd = ""
+    if samba.!smbd = "" then do /* in current directory? */
+        ok = SysFileTree('.\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in parent directory? */
+        ok = SysFileTree('..\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in ..\BIN directory? */
+        ok = SysFileTree('..\bin\smbd.exe', exist.,'FO')
+        if exist.0 = 1 then samba.!smbd = exist.1
+    end
+    if samba.!smbd = "" then do /* in SMB_EXE ? */
+        samba.!smbd = SysSearchPath("SMB_EXE","SMBD.EXE")
+    end
+    if samba.!smbd = "" then do /* in PATH ? */
+        samba.!smbd = SysSearchPath("PATH","SMBD.EXE")
+    end
+
+    samba.!bin = VRParseFileName(samba.!smbd,'DP')
+    if samba.!bin = "" then samba.!bin = samba.!tools
+
     samba.!pwd_mkdb = SysSearchPath("PATH","pwd_mkdb.exe")
     if samba.!pwd_mkdb = "" then do /* in current directory? */
@@ -179 +205 @@
         samba.!pwd_mkdb = SysSearchPath("SMB_SBIN","pwd_mkdb.exe")
     end
+return
+
+_SambaExtendSearchPath:
+    /* Add binary and tools path to the PATH variable */
+    old_path = value('PATH',, 'OS2ENVIRONMENT')
+    if pos(translate(samba.!bin';'),translate(old_path)) = 0 then do
+        if samba.!bin = samba.!tools then new_path = samba.!bin';'
+        else new_path = samba.!bin';'samba.!tools';'
+        ok = value('PATH', new_path || old_path, 'OS2ENVIRONMENT')
+        drop new_path
+    end
+    drop old_path
+    
+    /* Add binary and tools path to the BEGINLIBPATH variable */
+    old_beginlibpath = SysQueryEXtLibPath("B")
+    if pos(translate(samba.!bin';'),translate(old_beginlibpath)) = 0 then do
+        if samba.!bin = samba.!tools then new_beginlibpath = samba.!bin';'old_beginlibpath
+        else new_beginlibpath = samba.!bin';'samba.!tools';'old_beginlibpath
+        ok = SysSetExtLibPath( new_beginlibpath, "B")
+        drop new_beginlibpath
+    end
+    drop old_beginlibpath
 return