X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fpam-check.m4;h=26d14b850482e09331cc1ec46227d32a3e8128f9;hb=87c02d4df072d4b069b2e75462b2ee95eeb1fe7a;hp=4c7c1b962833e4398e469ce90673a3bc5614f277;hpb=b19bf8b3569ca2fc8199b55306482f71db14dd89;p=netatalk.git

diff --git a/macros/pam-check.m4 b/macros/pam-check.m4
index 4c7c1b96..26d14b85 100644
--- a/macros/pam-check.m4
+++ b/macros/pam-check.m4
@@ -1,9 +1,8 @@
-dnl $Id: pam-check.m4,v 1.2 2001-11-25 21:48:01 srittau Exp $
 dnl PAM finding macro
 
-AC_DEFUN([AC_PATH_PAM], [
-	AC_MSG_CHECKING([for PAM])
-	AC_ARG_WITH(pam, [  --with-pam=PATH         specify path to PAM installation],
+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"
 			if test "x$withval" = "xno"; then
@@ -18,44 +17,142 @@ AC_DEFUN([AC_PATH_PAM], [
 		[PAMDIR="NONE";require_pam="no"]
 	)
 
-	if test "x$PAMDIR" = "xNONE" -a "x$require_pam" != "xnever"; then
-		dnl Test for PAM
-		pam_paths="/ /usr /usr/local"
-		for path in $pam_paths; do
-			if test -d "$path/etc/pam.d"; then
+	AC_MSG_CHECKING([for PAM installation directory])
+	if test "$host_os" != "solaris"; then
+		if test "x$PAMDIR" = "xNONE" -a "x$require_pam" != "xnever"; then
+		  dnl Test for PAM
+		  pam_paths="/ /usr/ /usr/local/"
+		  for path in $pam_paths; do
+			if test -d "${path}etc/pam.d"; then
 				PAMDIR="$path"
 				break
 			fi
-		done
+		  done
+		fi
+
+		if test "x$PAMDIR" != "xNONE"; then
+			AC_MSG_RESULT([yes (path: ${PAMDIR}etc/pam.d)])
+		else
+			AC_MSG_RESULT([no])
+		fi
+	else
+		AC_MSG_RESULT([/etc/pam.conf (solaris)])
 	fi
+		
+	pam_found="no"
+	if test "x$require_pam" != "xnever"; then
 
-	PAM_CFLAGS=""
-	PAM_LIBS=""
+		savedCFLAGS="$CFLAGS"
+		savedLDFLAGS="$LDFLAGS"
+		savedLIBS="$LIBS"
 
-	pam_found="no"
-	if test "x$PAMDIR" != "xNONE"; then
-		AC_MSG_RESULT([yes (path: $PAMDIR)])
-		AC_CHECK_HEADER([security/pam_appl.h],[
+		if test "x$PAMDIR" != "xNONE" -a "x$PAMDIR" != "x/"; then
+			PAM_CFLAGS="-I${PAMDIR}include"
+			PAM_LDFLAGS="-L${PAMDIR}lib"
+			LDFLAGS="$LDFLAGS $PAM_LDFLAGS"
+			CFLAGS="$CFLAGS $PAM_CFLAGS"
+		fi
+
+		AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+
+		if test x"$ac_cv_header_security_pam_appl_h" = x"no" -a x"$ac_cv_header_pam_pam_appl_h" = x"no"; then
+			pam_found=no
+		else
 			AC_CHECK_LIB(pam, pam_set_item, [
-				PAM_CFLAGS="-I$PAMDIR/include"
-				PAM_LIBS="-L$PAMDIR/lib -lpam"
+				PAM_LIBS="$PAM_LDFLAGS -lpam"
 				pam_found="yes"
 			])
-		])
-	else
-		AC_MSG_RESULT([no])
+		fi
+		CFLAGS="$savedCFLAGS"
+		LDFLAGS="$savedLDFLAGS"
+		LIBS="$savedLIBS"
 	fi
 
+	netatalk_cv_install_pam=yes
+	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then
+		AC_MSG_WARN([PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path.])
+		netatalk_cv_install_pam=no
+    else
+        dnl Check for some system|common auth file
+        AC_MSG_CHECKING([for includable common PAM config])
+        pampath="${PAMDIR}etc/pam.d"
+        dnl Debian/SuSE
+        if test -f "$pampath/common-auth" ; then
+           PAM_DIRECTIVE=include
+           PAM_AUTH=common-auth
+           PAM_ACCOUNT=common-account
+           PAM_PASSWORD=common-password
+           PAM_SESSION=common-session
+        dnl RHEL/FC
+        elif test -f "$pampath/system-auth" ; then
+           PAM_DIRECTIVE=include
+           PAM_AUTH=system-auth
+           PAM_ACCOUNT=system-auth
+           PAM_PASSWORD=system-auth
+           PAM_SESSION=system-auth
+        dnl FreeBSD
+        elif test -f "$pampath/system" ; then
+           PAM_DIRECTIVE=include
+           PAM_AUTH=system
+           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
+           PAM_AUTH=pam_unix.so
+           PAM_ACCOUNT=pam_unix.so
+           PAM_PASSWORD="pam_unix.so use_authtok"
+           PAM_SESSION=pam_unix.so
+        fi  
+
+        if test "x$PAM_DIRECTIVE" != "xrequired" ; then
+            AC_MSG_RESULT([yes ($PAM_DIRECTIVE $PAM_AUTH)])
+        else
+            AC_MSG_RESULT([no (using defaut pam_unix.so)])
+        fi
+	fi
+
+	AC_MSG_CHECKING([whether to enable PAM support])
 	if test "x$pam_found" = "xno"; then
+		netatalk_cv_install_pam=no
 		if test "x$require_pam" = "xyes"; then
 			AC_MSG_ERROR([PAM support missing])
+		else
+			AC_MSG_RESULT([no])
 		fi
 		ifelse([$2], , :, [$2])
 	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)])],
+        PAMDIR=$withval,
+        PAMDIR='${sysconfdir}/pam.d'
+    )
+
+    LIB_REMOVE_USR_LIB(PAM_LIBS)
+    CFLAGS_REMOVE_USR_INCLUDE(PAM_CFLAGS)
 	AC_SUBST(PAMDIR)
 	AC_SUBST(PAM_CFLAGS)
 	AC_SUBST(PAM_LIBS)
+    AC_SUBST(PAM_DIRECTIVE)
+    AC_SUBST(PAM_AUTH)
+    AC_SUBST(PAM_ACCOUNT)
+    AC_SUBST(PAM_PASSWORD)
+    AC_SUBST(PAM_SESSION)
 ])