From bab9ac70b96e52aa1846315505cdbd045ce9b9eb Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Sun, 16 Nov 1997 03:38:22 +0000
Subject: [PATCH] (krb5_kt_copy_entry_contents): new function
 (krb5_kt_get_entry): retrieve the latest version if kvno == 0

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4009 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/keytab.c | 58 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 47 insertions(+), 11 deletions(-)

diff --git a/lib/krb5/keytab.c b/lib/krb5/keytab.c
index db135e76c..5c85d212a 100644
--- a/lib/krb5/keytab.c
+++ b/lib/krb5/keytab.c
@@ -149,26 +149,63 @@ krb5_kt_get_entry(krb5_context context,
 		  krb5_keytype keytype,
 		  krb5_keytab_entry *entry)
 {
+    krb5_keytab_entry tmp;
     krb5_error_code r;
     krb5_kt_cursor cursor;
 
     r = krb5_kt_start_seq_get (context, id, &cursor);
     if (r)
 	return KRB5_KT_NOTFOUND; /* XXX i.e. file not found */
-    while (krb5_kt_next_entry(context, id, entry, &cursor) == 0) {
+
+    entry->vno = 0;
+    while (krb5_kt_next_entry(context, id, &tmp, &cursor) == 0) {
 	if ((principal == NULL
-	     || (krb5_principal_compare(context,
-					principal,
-					entry->principal)))
-	    && (kvno == 0 || kvno == entry->vno)
-	    && (keytype == 0 || keytype == entry->keyblock.keytype)) {
-	    krb5_kt_end_seq_get (context, id, &cursor);
-	    return 0;
+	     || krb5_principal_compare(context,
+				       principal,
+				       tmp.principal))
+	    && (keytype == 0 || keytype == tmp.keyblock.keytype)) {
+	    if (kvno == tmp.vno) {
+		krb5_kt_copy_entry_contents (context, &tmp, entry);
+		krb5_kt_free_entry (context, &tmp);
+		krb5_kt_end_seq_get(context, id, &cursor);
+		return 0;
+	    } else if (kvno == 0 && tmp.vno > entry->vno) {
+		if (entry->vno)
+		    krb5_kt_free_entry (context, entry);
+		krb5_kt_copy_entry_contents (context, &tmp, entry);
+	    }
 	}
-	krb5_kt_free_entry(context, entry);
+	krb5_kt_free_entry(context, &tmp);
     }
     krb5_kt_end_seq_get (context, id, &cursor);
-    return KRB5_KT_NOTFOUND;
+    if (entry->vno)
+	return 0;
+    else
+	return KRB5_KT_NOTFOUND;
+}
+
+krb5_error_code
+krb5_kt_copy_entry_contents(krb5_context context,
+			    const krb5_keytab_entry *in,
+			    krb5_keytab_entry *out)
+{
+    krb5_error_code ret;
+
+    memset(out, 0, sizeof(*out));
+    out->vno = in->vno;
+
+    ret = krb5_copy_principal (context, in->principal, &out->principal);
+    if (ret)
+	goto fail;
+    ret = krb5_copy_keyblock_contents (context,
+				       &in->keyblock,
+				       &out->keyblock);
+    if (ret)
+	goto fail;
+    return 0;
+fail:
+    krb5_kt_free_entry (context, out);
+    return ret;
 }
 
 krb5_error_code
@@ -247,7 +284,6 @@ krb5_kt_ret_principal(krb5_storage *sp,
     if(p == NULL)
 	return ENOMEM;
 
-
     ret = krb5_ret_int16(sp, &tmp);
     if(ret) return ret;
     p->name.name_type = KRB5_NT_SRV_HST;