* kdb_cpw.c (add_key_pwd): set length to -1 so krb5_string_to_key

	handles the AFS3 salttype, but then replace it with the actual
	length for later processing.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9377 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index cdd78eae8fe38cde6efbcd30f1e54dfbd54a2779..53acac4714f666b4948957427a6f38cf6c44fade 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 11 20:21:02 1996  Mark Eichin  <eichin@cygnus.com>
+
+       * kdb_cpw.c (add_key_pwd): set length to -1 so krb5_string_to_key
+       handles the AFS3 salttype, but then replace it with the actual
+       length for later processing.
+
 Mon Nov 11 17:03:16 1996  Barry Jaspan  <bjaspan@mit.edu>
 
        * kdb_cpw.c (cleanup_key_data): fix memory leak [krb5-kdc/163]

diff --git a/src/lib/kdb/kdb_cpw.c b/src/lib/kdb/kdb_cpw.c
index c378ac6f90baf956538acb1d8a45649580c17897..87caafc233ef8416a47887bb6fca0140d922fa76 100644 (file)
--- a/src/lib/kdb/kdb_cpw.c
+++ b/src/lib/kdb/kdb_cpw.c
@@ -398,7 +398,7 @@ add_key_pwd(context, master_eblock, ks_tuple, ks_tuple_count, passwd,
                return(retval);
 
            key_salt.data = *saltdata;
-           /* key_salt.data.length = -1; *//*length actually used below...*/
+           key_salt.data.length = -1; /*length actually used below...*/
            krb5_xfree(saltdata);
        }
                break;
@@ -415,6 +415,10 @@ add_key_pwd(context, master_eblock, ks_tuple, ks_tuple_count, passwd,
             return(retval);
        }
 
+       if (key_salt.data.length == -1)
+           key_salt.data.length = 
+             krb5_princ_realm(context, db_entry->princ)->length;
+
        if (retval = krb5_dbekd_encrypt_key_data(context, master_eblock, &key,
                     (const krb5_keysalt *)&key_salt,
                     kvno, &db_entry->key_data[db_entry->n_key_data-1])) {