diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-07-14 14:50:18 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-07-14 21:21:13 +0200 |
| commit | 1aae898908fd0b1ae78742aa506e1edc395ed904 (patch) | |
| tree | ca5de6c45a817fbd42b36952ca2b609b9e5fbefe | |
| parent | 796f5727edff192493b0021fd7b0d5ea9e3e1e94 (diff) | |
| download | samba-1aae898908fd0b1ae78742aa506e1edc395ed904.tar.gz samba-1aae898908fd0b1ae78742aa506e1edc395ed904.tar.bz2 samba-1aae898908fd0b1ae78742aa506e1edc395ed904.zip | |
s3:clikrb5: fix the build with newer heimdal versions
krb5_get_default_in_tkt_etypes() requires a 3rd argument
if KRB5_PDU_NONE is available.
metze
Autobuild-User: Stefan Metzmacher <metze@samba.org>
Autobuild-Date: Thu Jul 14 21:21:13 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/configure.in | 2 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/source3/configure.in b/source3/configure.in index 814c7356d2..af8285fac6 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4380,6 +4380,8 @@ if test x"$with_ads_support" != x"no"; then [Whether the macro krb5_princ_realm is defined]) fi + AC_HAVE_DECL(KRB5_PDU_NONE,[#include <krb5.h>]) + # # # Now the decisions whether we can support krb5 diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index b11aed8c7b..c083af20a8 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -187,7 +187,11 @@ krb5_error_code krb5_auth_con_set_req_cksumtype( krb5_error_code get_kerberos_allowed_etypes(krb5_context context, krb5_enctype **enctypes) { +#ifdef HAVE_KRB5_PDU_NONE_DECL + return krb5_get_default_in_tkt_etypes(context, KRB5_PDU_NONE, enctypes); +#else return krb5_get_default_in_tkt_etypes(context, enctypes); +#endif } #else #error UNKNOWN_GET_ENCTYPES_FUNCTIONS |