Changeset 862 for trunk/server/source3/libads/kerberos_keytab.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/libads/kerberos_keytab.c (modified) (1 diff)

trunk/server/source3/libads/kerberos_keytab.c

@@ -262 +262 @@
         krb5_data password;
         krb5_kvno kvno;
-        krb5_enctype enctypes[4] = {
+        krb5_enctype enctypes[6] = {
                 ENCTYPE_DES_CBC_CRC,
                 ENCTYPE_DES_CBC_MD5,
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+                ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+#endif
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+                ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+#endif
                 ENCTYPE_ARCFOUR_HMAC,
                 0