oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Use correct ret value in load error messages

Browse Source
This commit is contained in:
Viktor Dukhovni
2017-12-06 21:18:47 -05:00
parent 8ec4f23701
commit bac9c1fe94
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kadmin/load.c
View File

@@ -603,7 +603,7 @@ doit(const char *filename, int mergep)
ret2 = db->hdb_store(context, db, HDB_F_REPLACE, &ent); ret2 = db->hdb_store(context, db, HDB_F_REPLACE, &ent);
hdb_free_entry (context, &ent); hdb_free_entry (context, &ent);
if (ret2) { if (ret2) {
krb5_warn(context, ret, "db_store"); krb5_warn(context, ret2, "db_store");
break; break;
} }
} }
@@ -612,12 +612,12 @@ doit(const char *filename, int mergep)
ret = ret2; ret = ret2;
ret2 = db->hdb_set_sync(context, db, 1); ret2 = db->hdb_set_sync(context, db, 1);
if (ret2) { if (ret2) {
krb5_err(context, 1, ret, "failed to sync the HDB"); krb5_err(context, 1, ret2, "failed to sync the HDB");
ret = ret2; ret = ret2;
} }
(void) kadm5_log_end(kadm_handle); (void) kadm5_log_end(kadm_handle);
ret2 = db->hdb_close(context, db); ret2 = db->hdb_close(context, db);
if (ret2 != 0) if (ret2)
ret = ret2; ret = ret2;
fclose(f); fclose(f);
return ret != 0; return ret != 0;