Enable PAM password authentication by default, unless PAM library and

headers are unusable.

diff --git a/openssh/configure.ac b/openssh/configure.ac
index e71551cd20f601ad94dea234f8d3fe4bc0519f85..0d3ad6ba42ad4e60aceb7562c56399692f05c700 100644 (file)
--- a/openssh/configure.ac
+++ b/openssh/configure.ac
@@ -1297,6 +1297,27 @@ AC_ARG_WITH(pam,
                                LIBPAM="-lpam"
                        fi
 
+                       AC_SUBST(LIBPAM)
+               fi
+       ],
+       [
+               AC_CHECK_LIB(dl, dlopen, , )
+               AC_CHECK_LIB(pam, pam_set_item, , )
+               AC_CHECK_FUNCS(pam_getenvlist)
+               AC_CHECK_FUNCS(pam_putenv)
+
+               if (test "x$ac_cv_header_security_pam_appl_h" = "xyes" || \
+                  test "x$ac_cv_header_pam_pam_appl_h" = "xyes") &&
+                  test "x$ac_cv_lib_pam_pam_set_item" = "xyes" ; then
+
+                       PAM_MSG="yes"
+
+                       AC_DEFINE(USE_PAM)
+                       if test $ac_cv_lib_dl_dlopen = yes; then
+                               LIBPAM="-lpam -ldl"
+                       else
+                               LIBPAM="-lpam"
+                       fi
                        AC_SUBST(LIBPAM)
                fi
        ]

diff --git a/openssh/sshd_config b/openssh/sshd_config
index 1abeebbaecfee8a59d5796d734c25f3a2707d888..2a60657084e90ee68e1532fea1aad93fbc3aa384 100644 (file)
--- a/openssh/sshd_config
+++ b/openssh/sshd_config
@@ -81,7 +81,7 @@
 # "PermitRootLogin without-password". If you just want the PAM account and 
 # session checks to run without PAM authentication, then enable this but set 
 # ChallengeResponseAuthentication=no
-#UsePAM no
+UsePAM yes
 
 #AllowTcpForwarding yes
 #GatewayPorts no