summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2012-05-07 11:52:34 +0200
committerStephen Gallagher <sgallagh@redhat.com>2012-05-07 14:35:49 -0400
commit7efbb82f43d5b7c17c4f7a4bfc363e6bf0291281 (patch)
treeee5fc492c3b130acd9962b56a4a093208c75d324
parent4246f60ebd574a30392f3bcf5048c2379a17399f (diff)
downloadsssd-7efbb82f43d5b7c17c4f7a4bfc363e6bf0291281.tar.gz
sssd-7efbb82f43d5b7c17c4f7a4bfc363e6bf0291281.tar.bz2
sssd-7efbb82f43d5b7c17c4f7a4bfc363e6bf0291281.zip
Kerberos locator: Include the correct krb5.h header file
https://fedorahosted.org/sssd/ticket/1325
-rw-r--r--src/external/krb5.m415
-rw-r--r--src/krb5_plugin/sssd_krb5_locator_plugin.c1
2 files changed, 14 insertions, 2 deletions
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4
index a8707c6e..ee966261 100644
--- a/src/external/krb5.m4
+++ b/src/external/krb5.m4
@@ -38,7 +38,12 @@ CFLAGS="$CFLAGS $KRB5_CFLAGS"
LIBS="$LIBS $KRB5_LIBS"
AC_CHECK_HEADERS([krb5.h krb5/krb5.h])
AC_CHECK_TYPES([krb5_ticket_times, krb5_times], [], [],
- [[#include <krb5.h>]])
+ [ #ifdef HAVE_KRB5_KRB5_H
+ #include <krb5/krb5.h>
+ #else
+ #include <krb5.h>
+ #endif
+ ])
AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \
krb5_free_unparsed_name \
krb5_get_init_creds_opt_set_expire_callback \
@@ -69,7 +74,13 @@ AC_ARG_ENABLE([krb5-locator-plugin],
AC_CHECK_HEADER([krb5/locate_plugin.h],
[have_locate_plugin=yes],
[have_locate_plugin=no]
- [AC_MSG_NOTICE([Kerberos locator plugin cannot be build])])
+ [AC_MSG_NOTICE([Kerberos locator plugin cannot be built])],
+ [ #ifdef HAVE_KRB5_KRB5_H
+ #include <krb5/krb5.h>
+ #else
+ #include <krb5.h>
+ #endif
+ ])
AM_CONDITIONAL([BUILD_KRB5_LOCATOR_PLUGIN],
[test x$have_locate_plugin = xyes -a x$build_locator = xyes])
diff --git a/src/krb5_plugin/sssd_krb5_locator_plugin.c b/src/krb5_plugin/sssd_krb5_locator_plugin.c
index b8d4e31b..8efbf4b0 100644
--- a/src/krb5_plugin/sssd_krb5_locator_plugin.c
+++ b/src/krb5_plugin/sssd_krb5_locator_plugin.c
@@ -33,6 +33,7 @@
#include <fcntl.h>
#include <ctype.h>
+#include "util/sss_krb5.h"
#include <krb5/locate_plugin.h>
#include "providers/krb5/krb5_common.h"