diff options
author | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-10-16 15:25:27 +0200 |
---|---|---|
committer | Benjamin Franzke <benjaminfranzke@googlemail.com> | 2013-10-17 13:43:59 +0200 |
commit | 9e8f85e24b971122f22f20e528e6d073db515634 (patch) | |
tree | b1c57bac19807e553c86310646c31b562490c5f7 /src/external/krb5.m4 | |
parent | 7b311152235b74d932afc6417b2f2199f2b0fa03 (diff) | |
download | sssd-9e8f85e24b971122f22f20e528e6d073db515634.tar.gz sssd-9e8f85e24b971122f22f20e528e6d073db515634.tar.bz2 sssd-9e8f85e24b971122f22f20e528e6d073db515634.zip |
heimdal: Fix sss_krb5_get_init_creds_opt_set_canonicalize
Heimdal and MIT Kerberos have a different number of arguments for that
function. Add a configure compile check and use the appropriate form.
Diffstat (limited to 'src/external/krb5.m4')
-rw-r--r-- | src/external/krb5.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/external/krb5.m4 b/src/external/krb5.m4 index a29056d3..54c5883e 100644 --- a/src/external/krb5.m4 +++ b/src/external/krb5.m4 @@ -69,6 +69,24 @@ AC_CHECK_FUNCS([krb5_get_init_creds_opt_alloc krb5_get_error_message \ krb5_cc_get_full_name \ krb5_free_string \ krb5_xfree]) + +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_KRB5_KRB5_H + #include <krb5/krb5.h> + #else + #include <krb5.h> + #endif + ]], + [[ krb5_get_init_creds_opt_set_canonicalize(NULL, 0); ]])], + [AC_DEFINE([KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS], [2], [number of arguments])]) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifdef HAVE_KRB5_KRB5_H + #include <krb5/krb5.h> + #else + #include <krb5.h> + #endif + ]], + [[ krb5_get_init_creds_opt_set_canonicalize(NULL, NULL, 0); ]])], + [AC_DEFINE([KRB5_GET_INIT_CREDS_OPT_SET_CANONICALIZE_ARGS], [3], [number of arguments])]) + CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS |