From ac18aa10dcf8401e85b6d8e4a735591989ee48ae Mon Sep 17 00:00:00 2001
From: "Roland C. Dowdeswell" <elric@imrryr.org>
Date: Mon, 21 May 2012 13:33:42 +0100
Subject: [PATCH] Eliminate unused variable warning.

---
 lib/hdb/print.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/lib/hdb/print.c b/lib/hdb/print.c
index b1c5d7bb4..0bb989b99 100644
--- a/lib/hdb/print.c
+++ b/lib/hdb/print.c
@@ -149,6 +149,7 @@ append_mit_key(krb5_context context, krb5_storage *sp,
                unsigned int kvno, Key *key)
 {
     krb5_error_code ret;
+    krb5_salt k5salt;
     ssize_t sz;
     size_t key_versions = key->salt ? 2 : 1;
     size_t decrypted_key_length;
@@ -156,6 +157,7 @@ append_mit_key(krb5_context context, krb5_storage *sp,
     krb5_data keylenbytes;
     unsigned int salttype;
 
+
     sz = append_string(context, sp, "\t%u\t%u\t%d\t%d\t", key_versions, kvno,
                         key->key.keytype, key->key.keyvalue.length + 2);
     if (sz == -1) return sz;
@@ -172,8 +174,8 @@ append_mit_key(krb5_context context, krb5_storage *sp,
         return sz;
     
     /* Map salt to MIT KDB style */
-    if (key->salt->type == KRB5_PADATA_PW_SALT) {
-        krb5_salt k5salt;
+    switch (key->salt->type) {
+    case KRB5_PADATA_PW_SALT:
 
         /*
          * Compute normal salt and then see whether it matches the stored one
@@ -188,16 +190,24 @@ append_mit_key(krb5_context context, krb5_storage *sp,
                  memcmp(key->salt->salt.data, princ->realm,
                         key->salt->salt.length) == 0)
             salttype = KRB5_KDB_SALTTYPE_ONLYREALM; /* matches realm */
-        else if (key->salt->salt.length == k5salt.saltvalue.length - strlen(princ->realm) &&
+        else if (key->salt->salt.length ==
+		 k5salt.saltvalue.length - strlen(princ->realm) &&
                  memcmp((char *)k5salt.saltvalue.data + strlen(princ->realm),
                         key->salt->salt.data, key->salt->salt.length) == 0)
             salttype = KRB5_KDB_SALTTYPE_NOREALM; /* matches w/o realm */
         else
             salttype = KRB5_KDB_SALTTYPE_NORMAL;  /* hope for best */
 
-    } else if (key->salt->type == KRB5_PADATA_AFS3_SALT) {
+	break;
+
+    case KRB5_PADATA_AFS3_SALT:
         salttype = KRB5_KDB_SALTTYPE_AFS3;
+	break;
+
+    default:
+	return -1;
     }
+
     sz = append_string(context, sp, "\t%u\t%u\t", salttype,
                        key->salt->salt.length);
     if (sz == -1) return sz;