jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 05:27:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Probe directly for com_err.h

Browse Source 
com_err.h can be in com_err.h, et/com_err.h, or krb5/com_err.h (for
netbsd 6.1 and possibly other netbsd). aklog currently only includes
either com_err.h or et/com_err.h, depending on autoconf probes
performed by the krb5.m4 macros.

So, also look for krb5/com_err.h. The krb5.m4 macros currently only
look for com_err.h at all if certain other libkrb5 tests return
certain results, so just look for all of them directly in some of our
openafs-specific krb5 probing logic in configure.ac.

Also remove the duplicate check for et/com_err.h in acinclude.m4 while
we're here. We only use et/com_err.h if krb5 support is enabled, so
only check for it in the second of krb5 probes.

FIXES 131716

Reviewed-on: http://gerrit.openafs.org/10244
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
(cherry picked from commit 8e32b11be6ce0517f75588360a3ca8c333358ca3)

Change-Id: I567959b6d26ece9606086f4d82c5be40b11d7ea8
Reviewed-on: http://gerrit.openafs.org/10275
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
This commit is contained in:
Andrew Deason 2013-09-11 11:22:20 -05:00 committed by Stephan Wiesand
parent 8e39eaa93a
commit 30f197727d
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -1310,7 +1310,6 @@ AC_HEADER_DIRENT
AC_CHECK_HEADERS([ \ AC_CHECK_HEADERS([ \
curses.h \ curses.h \
direct.h \ direct.h \
et/com_err.h \
fcntl.h \ fcntl.h \
grp.h \ grp.h \
mntent.h \ mntent.h \

5
configure.ac
View File

@ -82,6 +82,11 @@ AS_IF([test x"$KRB5_LIBS" != x],
[Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])]) [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
AC_CHECK_HEADERS([kerberosIV/krb.h]) AC_CHECK_HEADERS([kerberosIV/krb.h])
AC_CHECK_HEADERS([kerberosV/heim_err.h]) AC_CHECK_HEADERS([kerberosV/heim_err.h])
AC_CHECK_HEADERS([com_err.h et/com_err.h krb5/com_err.h])
AS_IF([test x"$ac_cv_header_com_err_h" != xyes \
&& test x"$ac_cv_header_et_com_err_h" != xyes \
&& test x"$ac_cv_header_krb5_com_err_h" != xyes],
[AC_MSG_ERROR([Cannot find a usable com_err.h])])
AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype,
krb5_creds.session, krb5_keytab_entry.key, krb5_creds.session, krb5_keytab_entry.key,
krb5_keytab_entry.keyblock, krb5_keyblock.enctype, krb5_keytab_entry.keyblock, krb5_keyblock.enctype,

10
src/aklog/aklog.c
View File

@ -64,10 +64,14 @@
#include <afs/stds.h> #include <afs/stds.h>
#include <krb5.h> #include <krb5.h>
#if defined(HAVE_ET_COM_ERR_H) #ifdef HAVE_COM_ERR_H
#include <et/com_err.h> # include <com_err.h>
#elif HAVE_ET_COM_ERR_H
# include <et/com_err.h>
#elif HAVE_KRB5_COM_ERR_H
# include <krb5/com_err.h>
#else #else
#include <com_err.h> # error No com_err.h? We need some kind of com_err.h
#endif #endif
#ifndef HAVE_KERBEROSV_HEIM_ERR_H #ifndef HAVE_KERBEROSV_HEIM_ERR_H