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

Indent the patch from Andrew and make it compile again

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-08-03 10:54:44 +02:00
parent ada7c73176
commit b2129c0751
1 changed files with 66 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/hdb/keytab.c
View File

@@ -321,6 +321,8 @@ hdb_next_entry(krb5_context context,
struct hdb_cursor *c = cursor->data; struct hdb_cursor *c = cursor->data;
krb5_error_code ret; krb5_error_code ret;
memset(entry, 0, sizeof(*entry));
if (c->first) { if (c->first) {
c->first = FALSE; c->first = FALSE;
ret = (c->db->hdb_firstkey)(context, c->db, ret = (c->db->hdb_firstkey)(context, c->db,
@@ -360,13 +362,21 @@ hdb_next_entry(krb5_context context,
* hdb is one record per principal. * hdb is one record per principal.
*/ */
krb5_copy_principal(context, ret = krb5_copy_principal(context,
c->hdb_entry.entry.principal, c->hdb_entry.entry.principal,
&entry->principal); &entry->principal);
if (ret)
return ret;
entry->vno = c->hdb_entry.entry.kvno; entry->vno = c->hdb_entry.entry.kvno;
krb5_copy_keyblock_contents(context, ret = krb5_copy_keyblock_contents(context,
&c->hdb_entry.entry.keys.val[c->key_idx].key, &c->hdb_entry.entry.keys.val[c->key_idx].key,
&entry->keyblock); &entry->keyblock);
if (ret) {
krb5_free_principal(context, entry->principal);
memset(entry, 0, sizeof(*entry));
return ret;
}
c->key_idx++; c->key_idx++;
/* /*
@@ -379,6 +389,7 @@ hdb_next_entry(krb5_context context,
c->next = TRUE; c->next = TRUE;
c->key_idx = 0; c->key_idx = 0;
} }
return 0; return 0;
} }