Update security/cyrus-saslauthd to 2.1.21. Changes from version 2.1.20

include:

* saslauthd/lak.c: leak fix from Igor Brezac
* saslauthd/krbtf.c: updated from CMUCS
* saslauthd/auth_krb5.c: log the krb5 error return if get_creds fails
* saslauthd/auth_krb5.c, saslauthd/auth_krb4.c,
  saslauthd/krbtf.h (added), saslauthd/krbtf.c (added),
  saslauthd/cfile.h (added), saslauthd/cfile.c (added),
  saslauthd/Makefile.am: Kerberos V4/V5 alternate keytab
  in saslauthd, plus common code merging (from David Eckhardt
  via Dale Moore)
* saslauthd/auth_krb5.c: verify against the service we
  were passed. needs to be made configurable.

7 files changed, 412 insertions, 14 deletions

diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index 3b30b62bcb6..5b2646d6094 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/03/14 16:00:41 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2006/04/18 17:42:59 jlam Exp $
 
-DISTNAME=	cyrus-sasl-2.1.20
+DISTNAME=	cyrus-sasl-2.1.21
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
diff --git a/security/cyrus-saslauthd/distinfo b/security/cyrus-saslauthd/distinfo
index 122416669ee..9f67ebfab8a 100644
--- a/security/cyrus-saslauthd/distinfo
+++ b/security/cyrus-saslauthd/distinfo
@@ -1,9 +1,12 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 13:10:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2006/04/18 17:42:59 jlam Exp $
 
-SHA1 (cyrus-sasl-2.1.20.tar.gz) = d1eec5644c4e87edb95fa5ab8bf124cfdf277eb6
-RMD160 (cyrus-sasl-2.1.20.tar.gz) = 45f8d9e91e5ba4840f57d2f0526b8f41f90bbb8c
-Size (cyrus-sasl-2.1.20.tar.gz) = 1775163 bytes
-SHA1 (patch-aa) = 1a4b8fd35e1888fcdf6eb1cef3cc6ae95c816acd
-SHA1 (patch-ab) = 8123e54b10b7094f73604c5ad055d0bfeb8fa0ac
+SHA1 (cyrus-sasl-2.1.21.tar.gz) = 6449f730c963d29d43600a95373a6e2db52d6d66
+RMD160 (cyrus-sasl-2.1.21.tar.gz) = 93e0e1868453c5781602b5cce23e746b8823a26b
+Size (cyrus-sasl-2.1.21.tar.gz) = 1584931 bytes
+SHA1 (patch-aa) = c507c791d94772909f8e56a1b81de17ebdb6c245
+SHA1 (patch-ab) = 1e410456cbe5d8711a08638038733f5513b917fb
 SHA1 (patch-ac) = 79267ad3e175632728e43fb2ba159ab411e7ff3c
 SHA1 (patch-ad) = c14defd79e6e0cec153be004fff3016ad6f0e731
+SHA1 (patch-ae) = de944306bcc8609a3353bf713876e0d42c9d05f9
+SHA1 (patch-af) = 0477e862dbc10d67fb0b82862eea612c81e46e39
+SHA1 (patch-ag) = d0dbe55b9a91ed49e2e43c2ef44e141ac86a83c7
diff --git a/security/cyrus-saslauthd/patches/patch-aa b/security/cyrus-saslauthd/patches/patch-aa
index 23cb65463a0..5993fa0a7fd 100644
--- a/security/cyrus-saslauthd/patches/patch-aa
+++ b/security/cyrus-saslauthd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2005/02/21 22:10:18 adam Exp $
+$NetBSD: patch-aa,v 1.4 2006/04/18 17:42:59 jlam Exp $
 
---- Makefile.am.orig	2004-10-19 23:48:20.000000000 +0000
+--- Makefile.am.orig	2005-01-10 00:39:54.000000000 -0500
 +++ Makefile.am
-@@ -28,11 +28,8 @@ INCLUDES	= -I$(top_srcdir)/include -I$(t
+@@ -29,11 +29,8 @@ INCLUDES	= -I$(top_srcdir)/include -I$(t
  DEFS            = @DEFS@ -DSASLAUTHD_CONF_FILE_DEFAULT=\"@sysconfdir@/saslauthd.conf\" -I. -I$(srcdir) -I..
  
  
diff --git a/security/cyrus-saslauthd/patches/patch-ab b/security/cyrus-saslauthd/patches/patch-ab
index d30972be07a..2354c69b85c 100644
--- a/security/cyrus-saslauthd/patches/patch-ab
+++ b/security/cyrus-saslauthd/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2005/02/21 22:10:18 adam Exp $
+$NetBSD: patch-ab,v 1.5 2006/04/18 17:42:59 jlam Exp $
 
---- Makefile.in.orig	2004-10-24 20:21:14.000000000 +0000
+--- Makefile.in.orig	2005-05-15 01:59:08.000000000 -0400
 +++ Makefile.in
-@@ -606,14 +606,11 @@ uninstall-am: uninstall-info-am uninstal
+@@ -611,14 +611,11 @@ uninstall-am: uninstall-info-am uninstal
  	uninstall-sbinPROGRAMS
  
  
diff --git a/security/cyrus-saslauthd/patches/patch-ae b/security/cyrus-saslauthd/patches/patch-ae
new file mode 100644
index 00000000000..f84b0c9dde9
--- /dev/null
+++ b/security/cyrus-saslauthd/patches/patch-ae
@@ -0,0 +1,49 @@
+$NetBSD: patch-ae,v 1.1 2006/04/18 17:42:59 jlam Exp $
+
+--- configure.in.orig	2005-05-07 00:54:18.000000000 -0400
++++ configure.in
+@@ -80,20 +80,36 @@ if test "$authsasldb" != no; then
+   SASL_DB_LIB="$SASL_DB_LIB ../sasldb/.libs/libsasldb.al"
+ fi
+ 
+-AC_ARG_WITH(pam, [  --with-pam=DIR          use PAM (rooted in DIR) [yes] ],
+-	with_pam=$withval,
+-	with_pam=yes)
++AC_ARG_WITH(pam, [  --with-pam=DIR          use PAM (rooted in DIR) [[yes]] ],
++        with_pam=$withval,
++        with_pam=yes)
+ if test "$with_pam" != no; then
+   if test -d $with_pam; then
+     CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
+     LDFLAGS="$LDFLAGS -L${with_pam}/lib"
+   fi
++  AC_CHECK_HEADERS(security/pam_appl.h pam/pam_appl.h)
+   cmu_save_LIBS="$LIBS"
+-  AC_CHECK_LIB(pam, pam_start, [
+-	  AC_CHECK_HEADER(security/pam_appl.h,,
+-			  with_pam=no)],
+-		with_pam=no, $SASL_DL_LIB)
+-  LIBS="$cmu_save_LIBS"
++  AC_CHECK_FUNC(pam_start, :,
++        LIBS="-lpam $LIBS"
++        AC_TRY_LINK([[
++#include <sys/types.h>
++#ifdef HAVE_PAM_PAM_APPL_H
++#include <pam/pam_appl.h>
++#endif
++#ifdef HAVE_SECURITY_PAM_H
++#include <security/pam_appl.h>
++#endif]],[[
++const char *service="foo";
++const char *user="bar";
++pam_handle_t *pamh;
++struct pam_conv *conv;
++int baz;
++baz = pam_start(service, user, conv, &pamh);
++return 0;
++]], LIBPAM="-lpam")
++)
++  LIBS="$cmu_save_LIBS $LIBPAM"
+ fi
+ 
+ AC_ARG_WITH(ipctype, [  --with-ipctype={unix,doors}    use ipctype [unix] ],
diff --git a/security/cyrus-saslauthd/patches/patch-af b/security/cyrus-saslauthd/patches/patch-af
new file mode 100644
index 00000000000..4571a6c17c3
--- /dev/null
+++ b/security/cyrus-saslauthd/patches/patch-af
@@ -0,0 +1,323 @@
+$NetBSD: patch-af,v 1.1 2006/04/18 17:42:59 jlam Exp $
+
+--- configure.orig	2006-04-18 13:03:08.000000000 -0400
++++ configure
+@@ -9322,75 +9322,23 @@ if test "$with_pam" != no; then
+     CPPFLAGS="$CPPFLAGS -I${with_pam}/include"
+     LDFLAGS="$LDFLAGS -L${with_pam}/lib"
+   fi
+-  cmu_save_LIBS="$LIBS"
+-  echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5
+-echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6
+-if test "${ac_cv_lib_pam_pam_start+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpam $SASL_DL_LIB $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+ 
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char pam_start ();
+-int
+-main ()
+-{
+-pam_start ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_lib_pam_pam_start=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_lib_pam_pam_start=no
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5
+-echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6
+-if test $ac_cv_lib_pam_pam_start = yes; then
+-
+-	  if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
+-  echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
++for ac_header in security/pam_appl.h pam/pam_appl.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ else
+   # Is the header compilable?
+-echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5
+-echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking $ac_header usability" >&5
++echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9399,7 +9347,7 @@ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-#include <security/pam_appl.h>
++#include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+@@ -9425,8 +9373,8 @@ echo "$as_me:$LINENO: result: $ac_header
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+ # Is the header present?
+-echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5
+-echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking $ac_header presence" >&5
++echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ /* confdefs.h.  */
+@@ -9434,7 +9382,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <security/pam_appl.h>
++#include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+@@ -9467,10 +9415,10 @@ echo "${ECHO_T}$ac_header_preproc" >&6
+ # So?  What about this header?
+ case $ac_header_compiler:$ac_header_preproc in
+   yes:no )
+-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9481,12 +9429,12 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+   no:yes )
+-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5
+-echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
++echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+     (
+       cat <<\_ASBOX
+ ## ------------------------------------ ##
+@@ -9497,29 +9445,157 @@ _ASBOX
+       sed "s/^/$as_me: WARNING:     /" >&2
+     ;;
+ esac
+-echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5
+-echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6
+-if test "${ac_cv_header_security_pam_appl_h+set}" = set; then
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  ac_cv_header_security_pam_appl_h=$ac_header_preproc
++  eval "$as_ac_Header=$ac_header_preproc"
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5
+-echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ 
+ fi
+-if test $ac_cv_header_security_pam_appl_h = yes; then
+-  :
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++  cmu_save_LIBS="$LIBS"
++  echo "$as_me:$LINENO: checking for pam_start" >&5
++echo $ECHO_N "checking for pam_start... $ECHO_C" >&6
++if test "${ac_cv_func_pam_start+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  with_pam=no
++  cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char pam_start (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char pam_start ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_pam_start) || defined (__stub___pam_start)
++choke me
++#else
++char (*f) () = pam_start;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != pam_start;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_pam_start=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_pam_start=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
++echo "$as_me:$LINENO: result: $ac_cv_func_pam_start" >&5
++echo "${ECHO_T}$ac_cv_func_pam_start" >&6
++if test $ac_cv_func_pam_start = yes; then
++  :
++else
++  LIBS="-lpam $LIBS"
++	cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++#include <sys/types.h>
++#ifdef HAVE_PAM_PAM_APPL_H
++#include <pam/pam_appl.h>
++#endif
++#ifdef HAVE_SECURITY_PAM_H
++#include <security/pam_appl.h>
++#endif
++int
++main ()
++{
+ 
++const char *service="foo";
++const char *user="bar";
++pam_handle_t *pamh;
++struct pam_conv *conv;
++int baz;
++baz = pam_start(service, user, conv, &pamh);
++return 0;
+ 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  LIBPAM="-lpam"
+ else
+-  with_pam=no
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++
+ fi
+ 
+-  LIBS="$cmu_save_LIBS"
++  LIBS="$cmu_save_LIBS $LIBPAM"
+ fi
+ 
+ 
diff --git a/security/cyrus-saslauthd/patches/patch-ag b/security/cyrus-saslauthd/patches/patch-ag
new file mode 100644
index 00000000000..6d2f17dc764
--- /dev/null
+++ b/security/cyrus-saslauthd/patches/patch-ag
@@ -0,0 +1,23 @@
+$NetBSD: patch-ag,v 1.1 2006/04/18 17:42:59 jlam Exp $
+
+--- saslauthd.h.in.orig	2005-05-15 02:02:30.000000000 -0400
++++ saslauthd.h.in
+@@ -89,12 +89,18 @@
+ /* Support for PAM? */
+ #undef HAVE_PAM
+ 
++/* Define to 1 if you have the <pam/pam_appl.h> header file. */
++#undef HAVE_PAM_PAM_APPL_H
++
+ /* Does compiler understand __PRETTY_FUNCTION__ */
+ #undef HAVE_PRETTY_FUNCTION
+ 
+ /* Include support for saslauthd? */
+ #undef HAVE_SASLAUTHD
+ 
++/* Define to 1 if you have the <security/pam_appl.h> header file. */
++#undef HAVE_SECURITY_PAM_APPL_H
++
+ /* Include SIA Support */
+ #undef HAVE_SIA
+