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:25:59 +0200 |
| commit | 82c8cd1732ebf89ec144e28b9ff26d8a2260a3e4 (patch) | |
| tree | 63ed9c0307c08c445ee4a0e820488c76d34cc88f /src/external | |
| parent | 612c71b24c39948168cefb691de563b56ff9915b (diff) | |
| download | sssd-82c8cd1732ebf89ec144e28b9ff26d8a2260a3e4.tar.gz sssd-82c8cd1732ebf89ec144e28b9ff26d8a2260a3e4.tar.bz2 sssd-82c8cd1732ebf89ec144e28b9ff26d8a2260a3e4.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')
| -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 |