diff options
| author | Simo Sorce <idra@samba.org> | 2008-09-03 11:52:54 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-09-03 11:52:54 -0400 |
| commit | c5894e14771562bccd153a98610722632ca3956a (patch) | |
| tree | 5ea00141df4ffa12bad3475fdafc525ffa4d92af /source3/libads | |
| parent | a1de4e988d7780f687bb7ed2288faf3dfbb9da71 (diff) | |
| parent | 84fca380f2040c53d20fff41972d2f4102183766 (diff) | |
| download | samba-c5894e14771562bccd153a98610722632ca3956a.tar.gz samba-c5894e14771562bccd153a98610722632ca3956a.tar.bz2 samba-c5894e14771562bccd153a98610722632ca3956a.zip | |
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
(This used to be commit 8e4dca3b9416d9b5e535bda5e4befc073bfc1641)
Diffstat (limited to 'source3/libads')
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index 77a50e4221..883f582445 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -161,15 +161,8 @@ int smb_krb5_kt_add_entry_ext(krb5_context context, for (i = 0; enctypes[i]; i++) { krb5_keyblock *keyp; -#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 */ - keyp = &kt_entry.key; -#endif -#ifdef HAVE_KRB5_KEYTAB_ENTRY_KEYBLOCK /* Heimdal */ - keyp = &kt_entry.keyblock; -#endif + keyp = KRB5_KT_KEY(&kt_entry); + if (create_kerberos_key_from_string(context, princ, &password, keyp, enctypes[i], no_salt)) { continue; } |