Bug 659: extend PAM support to OpenPAM

diff --git a/CHANGES b/CHANGES
index 4982083989451faef39805c0ac4f150f7eb090f5..3a9e9cf6555d50f24b3dc27740db1f99f45a9888 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,7 @@
 
 Changelog for HylaFAX 4.2.2
 
+* extend PAM support to OpenPAM variants (6 Jun 2005)
 * send PPR instead of DCN when an empty block is received (1 Jun 2005)
 * fix some dysfunctional mail redirects (30 May 2005)
 * don't save null-data pages (26 May, 6 Jun 2005)

diff --git a/configure b/configure
index ef171c05760eb0f41502d5e309b7a55840577016..1cc6ec95b92da92d6dc93c3521af91ccd11cf98e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1579,11 +1579,9 @@ PAMLIBS=""
 if [ "$DISABLE_PAM" != "yes" ]; then
        Note "Checking for PAM (Pluggable Authentication Module) support"
        CheckForLibrary pam_authenticate -lpam &&
-               CheckForLibrary misc_conv -lpam_misc -lpam &&
-               CheckForIncludeFile security/pam_appl.h &&
-               CheckForIncludeFile security/pam_misc.h && {
+               CheckForIncludeFile security/pam_appl.h && {
                        HAVE_PAM="#define HAVE_PAM 1"
-                       PAMLIBS="-lpam -lpam_misc"
+                       PAMLIBS="-lpam"
                }
        if [ "x$PAMLIBS" = "x" ]; then
                Note "... not found. Disabling PAM support"

diff --git a/hfaxd/HylaFAXServer.h b/hfaxd/HylaFAXServer.h
index e14d0bcd94325650874d54f06cabd5527293fbf1..31b8ef54b22131b5ee586c1916faa21f635760b1 100644 (file)
--- a/hfaxd/HylaFAXServer.h
+++ b/hfaxd/HylaFAXServer.h
@@ -43,7 +43,6 @@
 #ifdef HAVE_PAM
 extern "C" {
 #include <security/pam_appl.h>
-#include <security/pam_misc.h>
 #include <grp.h>
 }
 #endif // HAVE_PAM

diff --git a/hfaxd/Login.c++ b/hfaxd/Login.c++
index 10fd87e3c997875f16493b81a3a2fb3d8b53e1f5..68d712fc156147824a24425644600c42d2664fb2 100644 (file)
--- a/hfaxd/Login.c++
+++ b/hfaxd/Login.c++
@@ -109,7 +109,7 @@ pamconv(int num_msg, const struct pam_message **msg, struct pam_response **resp,
        for (i=0; i<num_msg; i++) {
                switch(msg[i]->msg_style) {
                        case PAM_PROMPT_ECHO_OFF:
-                               replies[i].resp = x_strdup(password);
+                               replies[i].resp = password ? strdup(password) : NULL;
                                replies[i].resp_retcode = 0;
                                retval = PAM_SUCCESS;
                                break;