jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pam into the kauth configure option

Browse Source 
Realistically, you shouldn't be using either kauth or pam.  The
pam functionality provided by the module in our tree is only
useful in a kaserver-style environment, so it makes sense to merge
the two knobs.

Retain a separate enable_pam variable so that it can be overridden
on a per-architecture basis where it is known to not work.  Consolidate
the two places where we did such checks, as well.

Change-Id: I6bf39ee5002f943548c51d089fe612f7e2f0501b
Reviewed-on: http://gerrit.openafs.org/11524
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Chas Williams - CONTRACTOR <chas@cmf.nrl.navy.mil>
Reviewed-by: D Brashear <shadow@your-file-system.com>
This commit is contained in:
Benjamin Kaduk 2014-10-06 13:31:23 -04:00 committed by D Brashear
parent 2c3a517e87
commit f7ddab6606
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
acinclude.m4
View File

@ -75,10 +75,6 @@ AC_ARG_WITH([afs-sysname],
[AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])]) [AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])])
dnl General feature options. dnl General feature options.
AC_ARG_ENABLE([pam],
[AS_HELP_STRING([--enable-pam], [enable PAM (kaserver) support])],
,
[enable_pam="no"])
AC_ARG_ENABLE([gtx], AC_ARG_ENABLE([gtx],
AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools])) AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools]))
AC_ARG_ENABLE([uss], AC_ARG_ENABLE([uss],
@ -165,10 +161,11 @@ AC_ARG_ENABLE([transarc-paths],
dnl Deprecated crypto dnl Deprecated crypto
AC_ARG_ENABLE([kauth], AC_ARG_ENABLE([kauth],
[AS_HELP_STRING([--enable-kauth], [AS_HELP_STRING([--enable-kauth],
[install the deprecated kauth server and utilities (defaults to [install the deprecated kauth server, pam modules, and utilities
disabled)])], (defaults to disabled)])],
, [enable_pam="yes"],
[enable_kauth="no"]) [enable_kauth="no"
enable_pam="no"])
dnl Optimization and debugging flags. dnl Optimization and debugging flags.
AC_ARG_ENABLE([strip-binaries], AC_ARG_ENABLE([strip-binaries],
@ -676,6 +673,7 @@ else
;; ;;
mips-sgi-irix6.5) mips-sgi-irix6.5)
AFS_SYSNAME="sgi_65" AFS_SYSNAME="sgi_65"
enable_pam="no"
;; ;;
ia64-*-linux*) ia64-*-linux*)
AFS_SYSNAME="ia64_linuxXX" AFS_SYSNAME="ia64_linuxXX"
@ -1490,16 +1488,8 @@ if test "$enable_debug_locks" = yes; then
AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr]) AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr])
fi fi
dnl Don't build PAM on IRIX; the interface doesn't work for us.
if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
case $AFS_SYSNAME in HAVE_PAM="YES"
sgi_*)
HAVE_PAM="no"
;;
*)
HAVE_PAM="yes"
;;
esac
else else
HAVE_PAM="no" HAVE_PAM="no"
fi fi