diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-06 21:53:23 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-06 21:53:23 +0000 |
| commit | 8e78a7eeb7266329891971090d2666f5c6a13ad0 (patch) | |
| tree | b5d8a1827176cd1fdc9da5983181ee25c30b31b8 /src/lib/kdb/kdb_log.c | |
| parent | 4a1d6a694452122f71d876e39ee335ea7ee022b6 (diff) | |
| download | krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.tar.gz krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.tar.xz krb5-8e78a7eeb7266329891971090d2666f5c6a13ad0.zip | |
Remove count parameters from get_principal, put_principal,
free_principal, delete_principal, and get_policy. Make get_principal
allocate the DB entry container. Fold krb5_db_get_principal_ext into
krb5_db_get_principal.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24175 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/kdb/kdb_log.c')
| -rw-r--r-- | src/lib/kdb/kdb_log.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/lib/kdb/kdb_log.c b/src/lib/kdb/kdb_log.c index fe128535cf..0842439a38 100644 --- a/src/lib/kdb/kdb_log.c +++ b/src/lib/kdb/kdb_log.c @@ -353,8 +353,6 @@ ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, char **db_args) goto cleanup; for (i = 0; i < no_of_updates; i++) { - int nentry = 1; - if (!upd->kdb_commit) continue; @@ -379,9 +377,7 @@ ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, char **db_args) free(dbprincstr); - retval = krb5int_delete_principal_no_log(context, - dbprinc, - &nentry); + retval = krb5int_delete_principal_no_log(context, dbprinc); if (dbprinc) { krb5_free_principal(context, dbprinc); @@ -400,15 +396,13 @@ ulog_replay(krb5_context context, kdb_incr_result_t *incr_ret, char **db_args) (void) memset(entry, 0, sizeof (krb5_db_entry)); - if ((retval = ulog_conv_2dbentry(context, entry, upd, 1))) + if ((retval = ulog_conv_2dbentry(context, &entry, upd))) goto cleanup; - retval = krb5int_put_principal_no_log(context, entry, - &nentry); + retval = krb5int_put_principal_no_log(context, entry); if (entry) { - krb5_db_free_principal(context, entry, nentry); - free(entry); + krb5_db_free_principal(context, entry); entry = NULL; } if (retval) |