Changeset 860 for vendor/current/source3/libads

Timestamp:

May 12, 2014, 8:58:38 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: updated vendor to latest version

Location:

vendor/current/source3/libads

Files:

• kerberos.c (modified) (2 diffs)
• kerberos_keytab.c (modified) (1 diff)
• kerberos_verify.c (modified) (1 diff)
• ldap.c (modified) (2 diffs)

vendor/current/source3/libads/kerberos.c

@@ -851 +851 @@
         char *realm_upper = NULL;
         bool result = false;
+        char *aes_enctypes = NULL;
 
         if (!lp_create_krb5_conf()) {
+                return false;
+        }
+
+        if (realm == NULL) {
+                DEBUG(0, ("No realm has been specified! Do you really want to "
+                          "join an Active Directory server?\n"));
+                return false;
+        }
+
+        if (domain == NULL || pss == NULL || kdc_name == NULL) {
                 return false;
         }
@@ -888 +899 @@
         }
 
+        aes_enctypes = talloc_strdup(fname, "");
+        if (aes_enctypes == NULL) {
+                goto done;
+        }
+
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+        aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes256-cts-hmac-sha1-96 ");
+        if (aes_enctypes == NULL) {
+                goto done;
+        }
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+        aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes128-cts-hmac-sha1-96");
+        if (aes_enctypes == NULL) {
+                goto done;
+        }
+#endif
+
         file_contents = talloc_asprintf(fname,
                                         "[libdefaults]\n\tdefault_realm = %s\n"
-                                        "\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
-                                        "\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
-                                        "\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+                                        "\tdefault_tgs_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+                                        "\tdefault_tkt_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+                                        "\tpreferred_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
                                         "[realms]\n\t%s = {\n"
                                         "\t%s\t}\n",
-                                        realm_upper, realm_upper, kdc_ip_string);
+                                        realm_upper, aes_enctypes, aes_enctypes, aes_enctypes,
+                                        realm_upper, kdc_ip_string);
 
         if (!file_contents) {

vendor/current/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

vendor/current/source3/libads/kerberos_verify.c

@@ -345 +345 @@
         krb5_data passwords[2];
         krb5_enctype enctypes[] = {
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+                ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+                ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+#endif
                 ENCTYPE_ARCFOUR_HMAC,
                 ENCTYPE_DES_CBC_CRC,

vendor/current/source3/libads/ldap.c

@@ -1921 +1921 @@
                 return ADS_ERROR(LDAP_NO_MEMORY);
         }
-        strupper_m(psp1);
-        strlower_m(&psp1[strlen(spn)]);
+        strlower_m(&psp1[strlen(spn) + 1]);
         servicePrincipalName[0] = psp1;
 
@@ -1935 +1934 @@
                 goto out;
         }
-        strupper_m(psp2);
-        strlower_m(&psp2[strlen(spn)]);
+        strlower_m(&psp2[strlen(spn) + 1]);
         servicePrincipalName[1] = psp2;