Bug 647: fix UID attribution when using PAM logins

diff --git a/CHANGES b/CHANGES
index 04bc49bf6e6e54bf9084335563db07a1c55fdeb5..800c2830cbb800eb26376eb1af0d10693d9c9056 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX
 
+* fix PAM authentication to set proper UID (9 May 2005)
 * add unlimited length option to image preparation scripts
   and add FaxModify customization support (9 May 2005)
 * add UseJobTSI modem config option and FAXNUMBER and TSI

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index dd963f9778ba7d67c10ff2ec2fbc98fde0c44484..4272dd2785b1533c7653f2357386c444f34610be 100644 (file)
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -44,28 +44,28 @@ Albert DeKnuydt      Paul Eggert          Juergen Fischer
 Kevin Fleming        John Florian         Patrice Fournier     
 Vyacheslav Frolov    John Gilman          Kris Henderson       
 Sascha Herrmann      Carsten Hoeger       Lee Howard           
-John Interrante      Damiam Ivereigh      Bernard Jech         
-Nico Kadel-Garcia    Sean Kamath          Jonathan Kamens      
-Dimitry Ketov        Steffan Klipsch      Hannu Koivisto       
-Arjen de Korte       Ken Lalonde          Ilguiz Latypov       
-Rob Leadbeater       Guillaume Legoupil   Greg Luck            
-Andy MacNamara       Lionel Mamane        Pierluigi Mangani    
-Campbell McKilligan  Bodo Meissner        John Miller          
-Aldo Mini            Boris Mironov        Seth Mos             
-Darren Nickerson     Andrea Nicolini      Giulio Orsero        
-Chris Parsons        Michael Pedersen     John Perkins         
-Simon Perry          Frank Peters         Vu Pham              
-John Patrick Poet    Harald Pollack       Andreas Pretzsch     
-Bernd Proissl        Matthew Rice         Tim Rice             
-Daniel Robbins       Giuseppe Sacco       Michael Salzmann     
-Sven Schmidt         John Sellens         Simon <iahnl@iah.nl> 
-Vilmos Soti          Alan Sparks          Andy Sparrow         
-Marco Steinacher     Iain Stevenson       Marius Strobl        
-Kazuhide Takahashi   Daryl Thachuk        Steve Tuckner        
-Aidan Van Dyk        Rich Walker          Norbert Warmuth      
-Phil Watkinson       James Werkowski      Chas Williams        
-John Williams        Steve Williams       John Wolfe           
-Bill Young           Bruce Young
+John Interrante      Sascha Ittner        Damiam Ivereigh      
+Bernard Jech         Nico Kadel-Garcia    Sean Kamath          
+Jonathan Kamens      Dimitry Ketov        Steffan Klipsch      
+Hannu Koivisto       Arjen de Korte       Ken Lalonde          
+Ilguiz Latypov       Rob Leadbeater       Guillaume Legoupil   
+Greg Luck            Andy MacNamara       Lionel Mamane        
+Pierluigi Mangani    Campbell McKilligan  Bodo Meissner        
+John Miller          Aldo Mini            Boris Mironov        
+Seth Mos             Darren Nickerson     Andrea Nicolini      
+Giulio Orsero        Chris Parsons        Michael Pedersen     
+John Perkins         Simon Perry          Frank Peters         
+Vu Pham              John Patrick Poet    Harald Pollack       
+Andreas Pretzsch     Bernd Proissl        Matthew Rice         
+Tim Rice             Daniel Robbins       Giuseppe Sacco       
+Michael Salzmann     Sven Schmidt         John Sellens         
+Simon <iahnl@iah.nl> Vilmos Soti          Alan Sparks          
+Andy Sparrow         Marco Steinacher     Iain Stevenson       
+Marius Strobl        Kazuhide Takahashi   Daryl Thachuk        
+Steve Tuckner        Aidan Van Dyk        Rich Walker          
+Norbert Warmuth      Phil Watkinson       James Werkowski      
+Chas Williams        John Williams        Steve Williams       
+John Wolfe           Bill Young           Bruce Young
 
 We appreciate and recognize the upstreamed contributions from these 
 distributions:

diff --git a/hfaxd/User.c++ b/hfaxd/User.c++
index 2b1ec91313e90eb8bd111f7e1e89be2e1d16705a..277b513b539025fadf4ff86a1d4d41d980f84b89 100644 (file)
--- a/hfaxd/User.c++
+++ b/hfaxd/User.c++
@@ -60,7 +60,12 @@ HylaFAXServer::checkUser(const char* name)
     } else
        logError("Unable to open the user access file %s: %s",
            (const char*) userAccessFile, strerror(errno));
-    return (check);
+    /*
+     * This causes the user to be prompted for a password
+     * and then denied access.  We do this to guard against
+     * folks that probe the server looking for valid accounts.
+     */
+    return (true);
 }
 
 static bool
@@ -183,13 +188,8 @@ HylaFAXServer::checkuser(FILE* db, const char* name)
            }
        }
     }
-    /*
-     * This causes the user to be prompted for a password
-     * and then denied access.  We do this to guard against
-     * folks that probe the server looking for valid accounts.
-     */
     passwd = "*";
-    return (true);
+    return (false);
 }
 
 fxDECLARE_PtrKeyDictionary(IDCache, u_int, fxStr)