Merge of kerberos changes to make this branch build again!

(This used to be commit 51b319f57f28e3993919d7f3db0251a724902332)

diff --git a/source3/libads/kerberos_verify.c b/source3/libads/kerberos_verify.c
index 379525a8e37a1cff8a0058d2ba086c259472043c..c1402b1370082f8ad57fd66b287ef303b3cbb0ac 100644 (file)
--- a/source3/libads/kerberos_verify.c
+++ b/source3/libads/kerberos_verify.c
@@ -36,13 +36,17 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
        krb5_keytab keytab = NULL;
        krb5_data packet;
        krb5_ticket *tkt = NULL;
-       int ret;
+       krb5_data salt;
+       krb5_encrypt_block eblock;
+       int ret, i;
        krb5_keyblock * key;
        krb5_principal host_princ;
        char *host_princ_s;
        fstring myname;
        char *password_s;
        krb5_data password;
+       krb5_enctype *enctypes = NULL;
+       BOOL auth_ok = False;
 
        if (!secrets_init()) {
                DEBUG(1,("secrets_init failed\n"));
@@ -67,7 +71,6 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
        ret = krb5_set_default_realm(context, ads->auth.realm);
        if (ret) {
                DEBUG(1,("krb5_set_default_realm failed (%s)\n", error_message(ret)));
-               ads_destroy(&ads);
                return NT_STATUS_LOGON_FAILURE;
        }
 
@@ -89,31 +92,55 @@ NTSTATUS ads_verify_ticket(ADS_STRUCT *ads, const DATA_BLOB *ticket,
                return NT_STATUS_LOGON_FAILURE;
        }
 
+       ret = krb5_principal2salt(context, host_princ, &salt);
+       if (ret) {
+               DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret)));
+               return NT_STATUS_LOGON_FAILURE;
+       }
+    
        if (!(key = (krb5_keyblock *)malloc(sizeof(*key)))) {
                return NT_STATUS_NO_MEMORY;
        }
        
-       if (create_kerberos_key_from_string(context, host_princ, &password, key)) {
-               SAFE_FREE(key);
+       if ((ret = krb5_get_permitted_enctypes(context, &enctypes))) {
+               DEBUG(1,("krb5_get_permitted_enctypes failed (%s)\n", 
+                        error_message(ret)));
                return NT_STATUS_LOGON_FAILURE;
        }
-    
-       krb5_auth_con_setuseruserkey(context, auth_context, key);
 
-       packet.length = ticket->length;
-       packet.data = (krb5_pointer)ticket->data;
+       /* we need to setup a auth context with each possible encoding type in turn */
+       for (i=0;enctypes[i];i++) {
+               krb5_use_enctype(context, &eblock, enctypes[i]);
 
-#if 0
-       file_save("/tmp/ticket.dat", ticket->data, ticket->length);
-#endif
+               ret = krb5_string_to_key(context, &eblock, key, &password, &salt);
+               if (ret) {
+                       continue;
+               }
 
-       if ((ret = krb5_rd_req(context, &auth_context, &packet, 
-                              NULL, keytab, NULL, &tkt))) {
+               krb5_auth_con_setuseruserkey(context, auth_context, key);
+
+               packet.length = ticket->length;
+               packet.data = (krb5_pointer)ticket->data;
+
+               if (!(ret = krb5_rd_req(context, &auth_context, &packet, 
+                                      NULL, keytab, NULL, &tkt))) {
+                       krb5_free_ktypes(context, enctypes);
+                       auth_ok = True;
+                       break;
+               }
+       }
+
+       if (!auth_ok) {
                DEBUG(3,("krb5_rd_req with auth failed (%s)\n", 
                         error_message(ret)));
                return NT_STATUS_LOGON_FAILURE;
        }
 
+#if 0
+       file_save("/tmp/ticket.dat", ticket->data, ticket->length);
+#endif
+
+
        if (tkt->enc_part2) {
                *auth_data = data_blob(tkt->enc_part2->authorization_data[0]->contents,
                                       tkt->enc_part2->authorization_data[0]->length);

diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index c94843150990e9ccb0299181050b5564bd413b6d..2047efd704083cf0bae8b57bddf7627c039fdf75 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/libsmb/clikrb5.c
@@ -70,54 +70,6 @@
  __ERROR__XX__UNKNOWN_ADDRTYPE
 #endif
 
-#if defined(HAVE_KRB5_PRINCIPAL2SALT) && defined(HAVE_KRB5_USE_ENCTYPE) && defined(HAVE_KRB5_STRING_TO_KEY)
- int create_kerberos_key_from_string(krb5_context context,
-                                       krb5_principal host_princ,
-                                       krb5_data *password,
-                                       krb5_keyblock *key)
-{
-       int ret;
-       krb5_data salt,
-       krb5_encrypt_block eblock;
-
-       ret = krb5_principal2salt(context, host_princ, &salt);
-       if (ret) {
-               DEBUG(1,("krb5_principal2salt failed (%s)\n", error_message(ret)));
-               return ret;
-       }
-       krb5_use_enctype(context, &eblock, ENCTYPE_DES_CBC_MD5);
-       return krb5_string_to_key(context, &eblock, key, password, &salt);
-}
-#elif defined(HAVE_KRB5_GET_PW_SALT) && defined(HAVE_KRB5_STRING_TO_KEY_SALT)
- int create_kerberos_key_from_string(krb5_context context,
-                                       krb5_principal host_princ,
-                                       krb5_data *password,
-                                       krb5_keyblock *key)
-{
-       int ret;
-       krb5_salt salt;
-
-       ret = krb5_get_pw_salt(context, host_princ, &salt);
-       if (ret) {
-               DEBUG(1,("krb5_get_pw_salt failed (%s)\n", error_message(ret)));
-               return ret;
-       }
-       return krb5_string_to_key_salt(context, ENCTYPE_DES_CBC_MD5, password->data,
-                       salt, key);
-}
-#else
- __ERROR_XX_UNKNOWN_CREATE_KEY_FUNCTIONS
-#endif
-
-#if defined(HAVE_KRB5_AUTH_CON_SETKEY) && !defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY)
- krb5_error_code krb5_auth_con_setuseruserkey(krb5_context context,
-               krb5_auth_context auth_context,
-               krb5_keyblock *keyblock)
-{
-       return krb5_auth_con_setkey(context, auth_context, keyblock);
-}
-#endif
-
 /*
   we can't use krb5_mk_req because w2k wants the service to be in a particular format
 */