From ecc751b6dde70490be33caa57a3d8461aa4860cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Wed, 6 May 2009 19:04:38 +0000
Subject: [PATCH] remove #if 0 codeblock

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@25196 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/hdb/mkey.c | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/hdb/mkey.c b/lib/hdb/mkey.c
index 213d26512..1520c4f7e 100644
--- a/lib/hdb/mkey.c
+++ b/lib/hdb/mkey.c
@@ -169,25 +169,24 @@ read_master_mit(krb5_context context, const char *filename,
 	return errno;
     }
     krb5_storage_set_flags(sp, KRB5_STORAGE_HOST_BYTEORDER);
-#if 0
     /* could possibly use ret_keyblock here, but do it with more
        checks for now */
-    ret = krb5_ret_keyblock(sp, &key);
-#else
-    ret = krb5_ret_int16(sp, &enctype);
-    if (ret)
-	goto out;
-    if((htons(enctype) & 0xff00) == 0x3000) {
-	ret = HEIM_ERR_BAD_MKEY;
-	krb5_set_error_message(context, ret, "unknown keytype in %s: %#x, expected %#x",
-			       filename, htons(enctype), 0x3000);
-	goto out;
+    {
+	ret = krb5_ret_int16(sp, &enctype);
+	if (ret)
+	    goto out;
+	if((htons(enctype) & 0xff00) == 0x3000) {
+	    ret = HEIM_ERR_BAD_MKEY;
+	    krb5_set_error_message(context, ret, "unknown keytype in %s: "
+				   "%#x, expected %#x",
+				   filename, htons(enctype), 0x3000);
+	    goto out;
+	}
+	key.keytype = enctype;
+	ret = krb5_ret_data(sp, &key.keyvalue);
+	if(ret)
+	    goto out;
     }
-    key.keytype = enctype;
-    ret = krb5_ret_data(sp, &key.keyvalue);
-    if(ret)
-	goto out;
-#endif
     ret = hdb_process_master_key(context, 0, &key, 0, mkey);
     krb5_free_keyblock_contents(context, &key);
   out: