The branch, master has been updated
via 24356f3 libkrb5: Fix build with MIT Kerberos.
from e39cce4 s4-libnet: Fix passing samba_all_enctypes as a fn rather
than the encrypt array it returns
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 24356f3cc9382b321939a53efec313ebce0acfa5
Author: Andreas Schneider <a...@samba.org>
Date: Wed Aug 29 10:36:21 2012 +0200
libkrb5: Fix build with MIT Kerberos.
Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org>
Autobuild-Date(master): Wed Aug 29 12:23:37 CEST 2012 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/krb5_wrap/enctype_convert.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/krb5_wrap/enctype_convert.c b/lib/krb5_wrap/enctype_convert.c
index 446384e..b78304f 100644
--- a/lib/krb5_wrap/enctype_convert.c
+++ b/lib/krb5_wrap/enctype_convert.c
@@ -28,11 +28,11 @@ const krb5_enctype *samba_all_enctypes(void)
{
/* TODO: Find a way not to have to use a fixed list */
static const krb5_enctype enctypes[] = {
- KRB5_ENCTYPE_DES_CBC_CRC,
- KRB5_ENCTYPE_DES_CBC_MD5,
- KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
- KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
- KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
+ ENCTYPE_DES_CBC_CRC,
+ ENCTYPE_DES_CBC_MD5,
+ ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+ ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+ ENCTYPE_ARCFOUR_HMAC,
0
};
return enctypes;
@@ -47,7 +47,7 @@ uint32_t kerberos_enctype_to_bitmap(krb5_enctype
enc_type_enum)
return ENC_CRC32;
case ENCTYPE_DES_CBC_MD5:
return ENC_RSA_MD5;
- case ENCTYPE_ARCFOUR_HMAC_MD5:
+ case ENCTYPE_ARCFOUR_HMAC:
return ENC_RC4_HMAC_MD5;
case ENCTYPE_AES128_CTS_HMAC_SHA1_96:
return ENC_HMAC_SHA1_96_AES128;
--
Samba Shared Repository
