From 57de67357256e81a8037bd0b413b2756aafe99b2 Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Tue, 30 Jan 2001 17:07:39 +0000
Subject: [PATCH] fix a typo and check some more return values

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9620 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 kdc/hprop.c | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/kdc/hprop.c b/kdc/hprop.c
index 3d4d5465b..4655e7846 100644
--- a/kdc/hprop.c
+++ b/kdc/hprop.c
@@ -169,7 +169,7 @@ kdb_prop(void *arg, Principal *p)
     return ret;
 }
 
-#endif
+#endif /* KRB4 */
 
 #ifndef KRB4
 static time_t
@@ -600,38 +600,39 @@ iterate (krb5_context context,
 	 int type,
 	 struct prop_data *pd)
 {
+    int ret;
+
     switch(type) {
     case HPROP_KRB4_DUMP:
-	v4_prop_dump(pd, database);
+	ret = v4_prop_dump(pd, database);
 	break;
 #ifdef KRB4
-    case HPROP_KRB4_DB: {
-	int e = kerb_db_iterate ((k_iter_proc_t)kdb_prop, pd);
-	if(e)
+    case HPROP_KRB4_DB:
+	ret = kerb_db_iterate ((k_iter_proc_t)kdb_prop, pd);
+	if(ret)
 	    krb5_errx(context, 1, "kerb_db_iterate: %s", 
-		      krb_get_err_text(e));
+		      krb_get_err_text(ret));
 	break;
-    }
 #ifdef KASERVER_DB
-    case HPROP_KASERVER: {
-	int e = ka_dump(pd, database, afs_cell);
-	if(e)
-	    krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(e));
+    case HPROP_KASERVER:
+	ret = ka_dump(pd, database, afs_cell);
+	if(ret)
+	    krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(ret));
 	break;
-    }
 #endif
 #endif /* KRB4 */
     case HPROP_MIT_DUMP:
-	mit_prop_dump(pd, database);
+	ret = mit_prop_dump(pd, database);
+	if (ret)
+	    krb5_errx(context, 1, "mit_prop_dump: %s",
+		      krb5_get_err_text(context, ret));
 	break;
-    case HPROP_HEIMDAL: {
-	krb5_error_code ret = hdb_foreach(context, db, HDB_F_DECRYPT,
-					  v5_prop, pd);
+    case HPROP_HEIMDAL:
+	ret = hdb_foreach(context, db, HDB_F_DECRYPT, v5_prop, pd);
 	if(ret)
 	    krb5_err(context, 1, ret, "hdb_foreach");
 	break;
     }
-    }
 }
 
 static int
@@ -794,7 +795,7 @@ main(int argc, char **argv)
     if(ka_db) {
 	if(type != 0)
 	    krb5_errx(context, 1, "more than one database type specified");
-	type = HPROP_KRB4_DB;
+	type = HPROP_KASERVER;
     }
 #endif
 #endif