Changeset 277 for branches

Timestamp:

Jun 18, 2009, 10:45:43 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Updates in the shared code for the GUI tools

Location:

branches/guitools-1.0/shared

Files:

• sambainit.vrs (modified) (6 diffs)
• swat.vrs (modified) (2 diffs)

branches/guitools-1.0/shared/sambainit.vrs

@@ -10 +10 @@
 
     /* Error status and file variables */
-    ErrorFile  = Tempdir'smbutil.error'
     ErrorState = 0 /* _ErrorBinaryNotFound() changes this variable */
     DataErrorState = 0 /* _ErrorDataFileNotFound() changes this variable */
@@ -27 +26 @@
     IF options.!debug == 1 THEN say '  UnixRoot       = "'UnixRoot'"'
 
-    /* if kLIBCPathrewriterInstalled() then do
-        unixetc = kLIBCpathRewriter("/etc")
-    end
-    else */
     unixetc = UnixRoot'\etc'
     IF options.!debug == 1 THEN say '  Unixetc        = "'unixetc'"'
 
-    /* Samba needs TMPDIR for several purposes - if it is absent Samba crashes */
-    if translate(value('TMPDIR',,'OS2ENVIRONMENT'),'\','/') = '' then do
-        Msg.Title = VRGet("Main", "Caption")
-        Msg.Text  = "Environment variable TMPDIR is missing - expect to see Samba crashes!"
-        Msg.Type  = "E"
-        call _ShowMsg
-    end
-
-    /* find all executables */
-
-    /* get the path to this file */
+    /* Find all executables */
+
+    /* Get the path to this file */
     samba.!tools = VRParseFilename(VRGet("Application", "Program"),'DP')
     if samba.!tools = '' then do
@@ -185 +172 @@
 
     /* find all datafiles - their locations are fixed */
+    
     /* the password files - we'll create them if they don't exist */
     samba.!masterpasswd = unixetc'\master.passwd'
@@ -225 +213 @@
     samba.!error = SysTempFileName(TempDir'smb_err.???')
     samba.!msg   = SysTempFileName(TempDir'smb_msg.???')
+    /* Use of this file is deprecated */
+    ErrorFile  = Tempdir'smbutil.error'
 
     IF options.!debug == 1 then do
@@ -260 +250 @@
 
 /*:VRX */
-_SambaRunning: procedure expose running. pids. TempDir HaveWinbindd
+_SambaExtendSearchPath:
+    IF options.!debug == 1 THEN say '_SambaExtendSearchPath() started'
+    /* 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
+    IF options.!debug == 1 THEN say '_SambaExtendSearchPath() done'
+return
+
+/*:VRX */
+_SambaRunning: procedure expose running. pids. TempDir HaveWinbindd options.
+    IF options.!debug == 1 THEN say '_SambaRunning() started'
+
     /* Checks whether any Samba daemon is currently running */
        
@@ -301 +318 @@
         runres = (running.!smbd | running.!nmbd |running.!winb)
     end
+    IF options.!debug == 1 THEN say '_SambaRunning() done'
 return runres
+
+/*:VRX */
+_PasswordDbRewrite: 
+    IF options.!debug == 1 THEN say "_PasswordDBRewrite() started"
+
+    /* Reset any old rc from pwd_mkdb.exe */
+    pwd_mkdbrc = 0
+
+    /* delete old .db.tmp files */
+    ok = SysFileDelete(UnixETC'\pwd.db.tmp')
+    ok = SysFileDelete(UnixETC'\spwd.db.tmp')
+
+    /* create backups of old .db files */
+    ok = VRCopyFile( UnixETC'\pwd.db',  UnixETC'\pwd.db.bak'  )
+    ok = VRCopyFile( UnixETC'\spwd.db', UnixETC'\spwd.db.bak' )
+
+    /* delete old .db files */
+    ok = SysFileDelete(UnixETC'\pwd.db')
+    ok = SysFileDelete(UnixETC'\spwd.db')
+
+    /* Create new password db */
+    address cmd samba.!pwd_mkdb' -d 'unixetc' 'samba.!masterpasswd' 2>'samba.!error
+    pwd_mkdbrc = rc
+    if \VRFileExists(samba.!pwddb) | pwd_mkdbrc <> 0 then do
+        call _SambaShowError
+    end
+    IF options.!debug == 1 THEN say "_PasswordDBRewrite() done ("pwd_mkdbrc")"
+return

branches/guitools-1.0/shared/swat.vrs

@@ -2 +2 @@
 */
 _FindHtpasswd: 
+    IF options.!debug == 1 THEN say '_FindHtpasswd() started'
     /* htpasswd.exe - required for SWAT but not really part of Samba */
     samba.!htpasswdexe = ""
@@ -59 +60 @@
         swatusers = ETC'\samba\private\swatusers'
     end
+    IF options.!debug == 1 THEN say '_FindHtpasswd() done'
 return