Skip to content
Snippets Groups Projects
Commit 2cef1e69 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Updates for MIT KerberosV 1.1 based upon suggestions

from Booker C. Bense <bbense@stanford.edu>.
parent fdc0dd7d
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
......@@ -446,13 +446,17 @@ fi
if test $ol_enable_kbind = yes -o $ol_enable_kpasswd = yes ; then
if test $ol_with_kerberos = no ; then
AC_MSG_ERROR([options require --with-kerberos])
elif $ol_with_kerberos = auto ; then
ol_with_kerberos=yes
fi
ol_with_kerberos=yes
elif test $ol_enable_kbind = no -o $ol_enable_kpasswd = no ; then
if test $ol_with_kerberos != no -a $ol_with_kerberos != auto ; then
if test $ol_with_kerberos = auto ; then
ol_with_kerberos=no
elif test $ol_with_kerberos != no ; then
AC_MSG_WARN([Kerberos detection enabled unnecessarily]);
ol_with_kerberos=no
fi
ol_with_kerberos=no
fi
if test $ol_enable_spasswd = yes ; then
......@@ -945,11 +949,15 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
fi
if test $krb5_impl = mit; then
AC_CHECK_LIB(k5crypto, main,
[krb5crypto=k5crypto],
[krb5crypto=crypto])
AC_CHECK_LIB(krb5, main,
[have_krb5=yes
KRB5_LIBS="-lkrb5 -lcrypto -lcom_err"],
KRB5_LIBS="-lkrb5 -l$krb5crypto -lcom_err"],
[have_krb5=no],
[-lcrypto -lcom_err])
[-l$krb5crypto -lcom_err])
elif test $krb5_impl = heimdal; then
AC_CHECK_LIB(krb5, main,
......@@ -960,6 +968,7 @@ if test $ol_with_kerberos = yes -o $ol_with_kerberos = auto \
AC_DEFINE(HAVE_HEIMDAL_KERBEROS, 1,
[define if you have HEIMDAL Kerberos])
else
have_krb5=no
AC_MSG_WARN([Unrecongized Kerberos5 Implementation])
......@@ -995,7 +1004,7 @@ if test $ol_link_krb5 = yes -a \( $ol_with_kerberos = yes -o \
if test $krb5_impl = mit; then
AC_CHECK_LIB(krb4, main, [have_k425=yes
KRB4_LIBS="-lkrb4 -ldes425"], [have_k425=no],
[-ldes425 -lkrb5 -lcrypto -lcom_err])
[-ldes425 -lkrb5 -l$krb5crypto -lcom_err])
elif test $krb5_impl = heimdal; then
AC_CHECK_LIB(krb4, main, [have_k425=yes
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment