sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Code

Merge of krb5_keytab entry key vs keyblock member check from HEAD.

Browse Source
This commit is contained in:
Tim Potter 0001-01-01 00:00:00 +00:00
parent 9b13dae5a9
commit 720f5e5629
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/configure.in
View File

@ -2654,6 +2654,15 @@ if test x"$with_ads_support" != x"no"; then
[Whether in-memory keytabs are supported])
fi
AC_CHECK_MEMBER(krb5_keytab_entry.key,
AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEY, 1,
[Whether krb5_keytab_entry has key member]), [],
[#include <krb5.h>])
AC_CHECK_MEMBER(krb5_keytab_entry.keyblock,
AC_DEFINE(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK, 1,
[Whether krb5_keytab_entry has keyblock member]), [],
[#include <krb5.h>])
if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])

16
source/libads/kerberos_verify.c
View File

@ -71,10 +71,18 @@ static krb5_error_code create_keytab(krb5_context context,
entry.principal = host_princ;
entry.vno = kvno;
/* this will have to be detected in configure...heimdal
calls it keyblock, MIT calls it key, but it does not
matter we are creating keytabs with MIT */
entry.keyblock = *key;
#if !defined(HAVE_KRB5_KEYTAB_ENTRY_KEY) && !defined(HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK)
#error krb5_keytab_entry has no key or keyblock member
#endif
#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEY /* MIT */
entry.key = *key;
#endif
#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */
entry.keyblock = *key;
#endif
DEBUG(10,("adding keytab-entry for (%s) with encryption type (%d)\n",
host_princ_s, enctypes[i]));