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:50:50 +02:00
parent 788480d28a
commit ada7c73176
1 changed files with 61 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
lib/hdb/keytab.c
View File

@@ -43,7 +43,7 @@ struct hdb_data {
struct hdb_cursor { struct hdb_cursor {
HDB *db; HDB *db;
hdb_entry_ex hdb_entry; hdb_entry_ex hdb_entry;
bool first, next; int first, next;
int key_idx; int key_idx;
}; };
@@ -272,7 +272,10 @@ hdb_start_seq_get(krb5_context context,
HDB *db; HDB *db;
if (dbname == NULL) { if (dbname == NULL) {
/* We don't support enumerating without being told what backend to enumerate on */ /*
* We don't support enumerating without being told what
* backend to enumerate on
*/
ret = KRB5_KT_NOTFOUND; ret = KRB5_KT_NOTFOUND;
return ret; return ret;
} }
@@ -301,15 +304,16 @@ hdb_start_seq_get(krb5_context context,
} }
c->db = db; c->db = db;
c->first = true; c->first = TRUE;
c->next = true; c->next = TRUE;
c->key_idx = 0; c->key_idx = 0;
cursor->data = c; cursor->data = c;
return ret; return ret;
} }
static int hdb_next_entry(krb5_context context, static int
hdb_next_entry(krb5_context context,
krb5_keytab id, krb5_keytab id,
krb5_keytab_entry *entry, krb5_keytab_entry *entry,
krb5_kt_cursor *cursor) krb5_kt_cursor *cursor)
@@ -318,22 +322,20 @@ static int hdb_next_entry(krb5_context context,
krb5_error_code ret; krb5_error_code ret;
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,
HDB_F_DECRYPT| HDB_F_DECRYPT|
HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT, HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
&c->hdb_entry); &c->hdb_entry);
if (ret == HDB_ERR_NOENTRY) { if (ret == HDB_ERR_NOENTRY)
return KRB5_KT_END; return KRB5_KT_END;
} else if (ret) { else if (ret)
return ret; return ret;
}
if (c->hdb_entry.entry.keys.len == 0) { if (c->hdb_entry.entry.keys.len == 0)
hdb_free_entry(context, &c->hdb_entry); hdb_free_entry(context, &c->hdb_entry);
} else { else
c->next = false; c->next = FALSE;
}
} }
while (c->next) { while (c->next) {
@@ -341,21 +343,23 @@ static int hdb_next_entry(krb5_context context,
HDB_F_DECRYPT| HDB_F_DECRYPT|
HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT, HDB_F_GET_CLIENT|HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
&c->hdb_entry); &c->hdb_entry);
if (ret == HDB_ERR_NOENTRY) { if (ret == HDB_ERR_NOENTRY)
return KRB5_KT_END; return KRB5_KT_END;
} else if (ret) { else if (ret)
return ret; return ret;
}
if (c->hdb_entry.entry.keys.len == 0) {
/* If no keys on this entry, try again */
hdb_free_entry(context, &c->hdb_entry);
} else {
/* We have an entry, set the flag */
c->next = false;
}
};
/* return next enc type (keytabs are one slot per key, while hdb is one record per principal */ /* If no keys on this entry, try again */
if (c->hdb_entry.entry.keys.len == 0)
hdb_free_entry(context, &c->hdb_entry);
else
c->next = FALSE;
}
/*
* Return next enc type (keytabs are one slot per key, while
* hdb is one record per principal.
*/
krb5_copy_principal(context, krb5_copy_principal(context,
c->hdb_entry.entry.principal, c->hdb_entry.entry.principal,
&entry->principal); &entry->principal);
@@ -365,10 +369,14 @@ static int hdb_next_entry(krb5_context context,
&entry->keyblock); &entry->keyblock);
c->key_idx++; c->key_idx++;
/* Once we get to the end of the list, signal that we want the next entry */ /*
* Once we get to the end of the list, signal that we want the
* next entry
*/
if (c->key_idx == c->hdb_entry.entry.keys.len) { if (c->key_idx == c->hdb_entry.entry.keys.len) {
hdb_free_entry(context, &c->hdb_entry); hdb_free_entry(context, &c->hdb_entry);
c->next = true; c->next = TRUE;
c->key_idx = 0; c->key_idx = 0;
} }
return 0; return 0;