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
This commit is contained in:
Assar Westerlund
2001-01-30 17:07:39 +00:00
parent ce7c5c923a
commit 57de673572

View File

@@ -169,7 +169,7 @@ kdb_prop(void *arg, Principal *p)
return ret; return ret;
} }
#endif #endif /* KRB4 */
#ifndef KRB4 #ifndef KRB4
static time_t static time_t
@@ -600,39 +600,40 @@ iterate (krb5_context context,
int type, int type,
struct prop_data *pd) struct prop_data *pd)
{ {
int ret;
switch(type) { switch(type) {
case HPROP_KRB4_DUMP: case HPROP_KRB4_DUMP:
v4_prop_dump(pd, database); ret = v4_prop_dump(pd, database);
break; break;
#ifdef KRB4 #ifdef KRB4
case HPROP_KRB4_DB: { case HPROP_KRB4_DB:
int e = kerb_db_iterate ((k_iter_proc_t)kdb_prop, pd); ret = kerb_db_iterate ((k_iter_proc_t)kdb_prop, pd);
if(e) if(ret)
krb5_errx(context, 1, "kerb_db_iterate: %s", krb5_errx(context, 1, "kerb_db_iterate: %s",
krb_get_err_text(e)); krb_get_err_text(ret));
break; break;
}
#ifdef KASERVER_DB #ifdef KASERVER_DB
case HPROP_KASERVER: { case HPROP_KASERVER:
int e = ka_dump(pd, database, afs_cell); ret = ka_dump(pd, database, afs_cell);
if(e) if(ret)
krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(e)); krb5_errx(context, 1, "ka_dump: %s", krb_get_err_text(ret));
break; break;
}
#endif #endif
#endif /* KRB4 */ #endif /* KRB4 */
case HPROP_MIT_DUMP: 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; break;
case HPROP_HEIMDAL: { case HPROP_HEIMDAL:
krb5_error_code ret = hdb_foreach(context, db, HDB_F_DECRYPT, ret = hdb_foreach(context, db, HDB_F_DECRYPT, v5_prop, pd);
v5_prop, pd);
if(ret) if(ret)
krb5_err(context, 1, ret, "hdb_foreach"); krb5_err(context, 1, ret, "hdb_foreach");
break; break;
} }
} }
}
static int static int
dump_database (krb5_context context, int type, dump_database (krb5_context context, int type,
@@ -794,7 +795,7 @@ main(int argc, char **argv)
if(ka_db) { if(ka_db) {
if(type != 0) if(type != 0)
krb5_errx(context, 1, "more than one database type specified"); krb5_errx(context, 1, "more than one database type specified");
type = HPROP_KRB4_DB; type = HPROP_KASERVER;
} }
#endif #endif
#endif #endif