X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fpam-check.m4;h=609c92dcae18885775afd8b744b1d6a5a73f9b73;hb=42eb54de3f6373cd394fbd6abfb86d85c8dde935;hp=e5663db347fb0f5e3b08884791014305e5c3dbc4;hpb=1d5c8032fa0438f00056da0cc289248821ebf54a;p=netatalk.git

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
index e5663db3..609c92dc 100644
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -1,7 +1,7 @@
-dnl $Id: pam-check.m4,v 1.6 2010-01-11 13:06:02 franklahm Exp $
 dnl PAM finding macro
 
-AC_DEFUN([AC_PATH_PAM], [
+AC_DEFUN([AC_NETATALK_PATH_PAM], [
+    netatalk_cv_use_pam=no
 	AC_ARG_WITH(pam, [  --with-pam[[=PATH]]       specify path to PAM installation [[auto]]],
 		[
 			require_pam="yes"
@@ -97,6 +97,13 @@ AC_DEFUN([AC_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
@@ -125,8 +132,21 @@ AC_DEFUN([AC_PATH_PAM], [
 	else
 		AC_MSG_RESULT([yes])
 		ifelse([$1], , :, [$1])
+        use_pam_so=yes
+	    compile_pam=yes
+	    netatalk_cv_use_pam=yes
+	    AC_DEFINE(USE_PAM, 1, [Define to enable PAM support])
 	fi
 
+    AC_ARG_WITH(
+        pam-confdir,
+        [AS_HELP_STRING([--with-pam-confdir=PATH],[Path to PAM config dir (default: ${sysconfdir}/pam.d)])],
+        ac_cv_pamdir=$withval,
+        ac_cv_pamdir='${sysconfdir}/pam.d'
+    )
+
+    PAMDIR="$ac_cv_pamdir"
+
     LIB_REMOVE_USR_LIB(PAM_LIBS)
     CFLAGS_REMOVE_USR_INCLUDE(PAM_CFLAGS)
 	AC_SUBST(PAMDIR)