* kdb_xdr.c (krb5_dbe_search_enctype): Make a more general version

	of kdb5_dbe_find_enctype() which allows you to search the
	keylist looking for multiple keys that fit your criteria.
	Eventually we should convert all programs to use
	kdb5_dbe_search_enctype() instead of kdb5_dbe_find_enctype().

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

diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog
index 15bdd684bc24257a1fdc9448f164c7b580d75e61..934dda6d611ce6a3509dd0af4b98dcc7e38e0bda 100644 (file)
--- a/src/lib/kdb/ChangeLog
+++ b/src/lib/kdb/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov  7 16:35:03 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+       * kdb_xdr.c (krb5_dbe_search_enctype): Make a more general version
+               of kdb5_dbe_find_enctype() which allows you to search the
+               keylist looking for multiple keys that fit your criteria.
+               Eventually we should convert all programs to use
+               kdb5_dbe_search_enctype() instead of kdb5_dbe_find_enctype().
 
 Fri Nov 03 04:49:58 1995  Chris Provenzano (proven@mit.edu)
 

diff --git a/src/lib/kdb/kdb_xdr.c b/src/lib/kdb/kdb_xdr.c
index dee44db0cb32d95d49764d4c38281eb02a837f38..debab57df6927e5b4588d80e4760607628e69722 100644 (file)
--- a/src/lib/kdb/kdb_xdr.c
+++ b/src/lib/kdb/kdb_xdr.c
@@ -53,7 +53,6 @@ krb5_dbe_encode_last_pwd_change(context, stamp, entry)
     krb5_tl_last_change * stamp;
     krb5_db_entry       * entry;
 {
-    krb5_error_code       retval;
     krb5_tl_data       ** tl_data;
     krb5_octet          * nextloc;
 
@@ -110,6 +109,7 @@ krb5_dbe_decode_last_pwd_change(context, entry, stamp)
         }
     }
     stamp->last_pwd_change = 0;
+    return 0;
 }
 
 krb5_error_code
@@ -700,19 +700,20 @@ krb5_dbe_free_contents(context, entry)
  * the other attributes.
  */
 krb5_error_code
-krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
+krb5_dbe_search_enctype(kcontext, dbentp, start, ktype, stype, kvno, kdatap)
     krb5_context       kcontext;
     krb5_db_entry      *dbentp;
-    krb5_enctype       ktype;
+    krb5_int32         *start;
+    krb5_int32         ktype;
     krb5_int32         stype;
     krb5_int32         kvno;
     krb5_key_data      **kdatap;
 {
-    int                        i;
+    int                        i, index;
     int                        maxkvno;
     krb5_key_data      *datap;
 
-    if (kvno == stype == ktype == -1) 
+    if (kvno == -1 && stype == -1 && ktype == -1)
        kvno = 0;
 
     if (kvno == 0) { 
@@ -740,7 +741,7 @@ krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
 
     maxkvno = -1;
     datap = (krb5_key_data *) NULL;
-    for (i = 0; i < dbentp->n_key_data; i++) {
+    for (i = *start; i < dbentp->n_key_data; i++) {
         krb5_enctype db_ktype;
         krb5_int32   db_stype;
 
@@ -749,7 +750,7 @@ krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
        case ENCTYPE_DES_CBC_MD5:
        case ENCTYPE_DES_CBC_RAW:
            db_ktype = ENCTYPE_DES_CBC_CRC;
-       defualt:
+       default:
            break;
        }
        if (dbentp->key_data[i].key_data_ver > 1) {
@@ -757,11 +758,12 @@ krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
        } else {
            db_stype = KRB5_KDB_SALTTYPE_NORMAL;
        }
-       if (((db_ktype == ktype) || (ktype < 0)) && 
+       if (((db_ktype == (krb5_enctype) ktype) || (ktype < 0)) && 
            ((db_stype == stype) || (stype < 0))) {
            if (kvno >= 0) {
                if (kvno == dbentp->key_data[i].key_data_kvno) {
                    datap = &dbentp->key_data[i];
+                   index = i;
                    maxkvno = kvno;
                    break;
                }
@@ -769,11 +771,31 @@ krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
                if (dbentp->key_data[i].key_data_kvno > maxkvno) {
                    maxkvno = dbentp->key_data[i].key_data_kvno;
                    datap = &dbentp->key_data[i];
+                   index = i;
                }
            }
        }
     }
+    if (maxkvno < 0)
+       return ENOENT;
     *kdatap = datap;
-    return((maxkvno >= 0) ? 0 : ENOENT);
+    *start = index+1;
+    return 0;
+}
+
+krb5_error_code
+krb5_dbe_find_enctype(kcontext, dbentp, ktype, stype, kvno, kdatap)
+    krb5_context       kcontext;
+    krb5_db_entry      *dbentp;
+    krb5_int32         ktype;
+    krb5_int32         stype;
+    krb5_int32         kvno;
+    krb5_key_data      **kdatap;
+{
+    krb5_int32 start = 0;
+
+    return krb5_dbe_search_enctype(kcontext, dbentp, &start, ktype, stype,
+                                  kvno, kdatap);
 }
 
+