Skip to content

Commit

Permalink
Merge pam into the kauth configure option
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kaduk committed Oct 6, 2014
1 parent 42be053 commit 788776a
Showing 1 changed file with 7 additions and 17 deletions.
24 changes: 7 additions & 17 deletions acinclude.m4
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ AC_ARG_WITH([afs-sysname],
[AS_HELP_STRING([--with-afs-sysname=sys], [use sys for the afs sysname])])
dnl General feature options.
AC_ARG_ENABLE([pam],
[AS_HELP_STRING([--enable-pam], [enable PAM (kaserver) support])],
,
[enable_pam="no"])
AC_ARG_ENABLE([gtx],
AS_HELP_STRING([--disable-gtx], [disable gtx curses-based terminal tools]))
AC_ARG_ENABLE([uss],
Expand Down Expand Up @@ -165,10 +161,11 @@ AC_ARG_ENABLE([transarc-paths],
dnl Deprecated crypto
AC_ARG_ENABLE([kauth],
[AS_HELP_STRING([--enable-kauth],
[install the deprecated kauth server and utilities (defaults to
disabled)])],
,
[enable_kauth="no"])
[install the deprecated kauth server, pam modules, and utilities
(defaults to disabled)])],
[enable_pam="yes"],
[enable_kauth="no"
enable_pam="no"])
dnl Optimization and debugging flags.
AC_ARG_ENABLE([strip-binaries],
Expand Down Expand Up @@ -676,6 +673,7 @@ else
;;
mips-sgi-irix6.5)
AFS_SYSNAME="sgi_65"
enable_pam="no"
;;
ia64-*-linux*)
AFS_SYSNAME="ia64_linuxXX"
Expand Down Expand Up @@ -1490,16 +1488,8 @@ if test "$enable_debug_locks" = yes; then
AC_DEFINE(OPR_DEBUG_LOCKS, 1, [turn on lock debugging in opr])
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
case $AFS_SYSNAME in
sgi_*)
HAVE_PAM="no"
;;
*)
HAVE_PAM="yes"
;;
esac
HAVE_PAM="YES"
else
HAVE_PAM="no"
fi
Expand Down

0 comments on commit 788776a

Please sign in to comment.