Merge 3.0.2 release branch

[netatalk.git] / macros / pam-check.m4

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
index 6bc40cbad841562161bf2c1a6a1f3cd776cdb5e4..17a92898c6d7b4c8e7161c298c81ddb04f5044c4 100644 (file)
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -1,4 +1,3 @@
-dnl $Id: pam-check.m4,v 1.6 2010-01-11 13:06:02 franklahm Exp $
 dnl PAM finding macro
 
 AC_DEFUN([AC_NETATALK_PATH_PAM], [
@@ -98,6 +97,13 @@ AC_DEFUN([AC_NETATALK_PATH_PAM], [
            PAM_ACCOUNT=system
            PAM_PASSWORD=system
            PAM_SESSION=system
+        dnl Solaris 11+
+        elif test -f "$pampath/other" ; then
+           PAM_DIRECTIVE=include
+           PAM_AUTH=${PAMDIR}etc/pam.d/other
+           PAM_ACCOUNT=${PAMDIR}etc/pam.d/other
+           PAM_PASSWORD=${PAMDIR}etc/pam.d/other
+           PAM_SESSION=${PAMDIR}etc/pam.d/other
         dnl Fallback
         else
            PAM_DIRECTIVE=required