Changeset 283 for branches/scripts/user

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

File:

• branches/scripts/user/usermod.cmd (modified) (4 diffs)

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