diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-07-02 19:18:12 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-07-02 19:18:12 +0000 |
| commit | f6e3bd28d32e584b6b4bcfe63a48466c97428b59 (patch) | |
| tree | 1076ab68ccdfb86d9e9073912e0a7ddb02d7d21d /src/plugins/kdb | |
| parent | b119d362e2e195a61488737511be2ca7b37138b5 (diff) | |
| download | krb5-f6e3bd28d32e584b6b4bcfe63a48466c97428b59.tar.gz krb5-f6e3bd28d32e584b6b4bcfe63a48466c97428b59.tar.xz krb5-f6e3bd28d32e584b6b4bcfe63a48466c97428b59.zip | |
Make krb5_db_free_principal and krb5_db_free_mkey_list return void.
Remove the stale prototype for krb5_db_free_master_key.
ticket: 6749
status: open
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24167 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/plugins/kdb')
| -rw-r--r-- | src/plugins/kdb/db2/db2_exp.c | 10 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/kdb_db2.c | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/kdb_db2.h | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c | 2 | ||||
| -rw-r--r-- | src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/kdb/db2/db2_exp.c b/src/plugins/kdb/db2/db2_exp.c index aabeb9d03..f6132e98d 100644 --- a/src/plugins/kdb/db2/db2_exp.c +++ b/src/plugins/kdb/db2/db2_exp.c @@ -125,11 +125,11 @@ WRAP_K (krb5_db2_get_principal, int * i, krb5_boolean *b), (ctx, p, d, i, b)); -WRAP_K (krb5_db2_free_principal, - (krb5_context ctx, - krb5_db_entry *d, - int i), - (ctx, d, i)); +WRAP_VOID (krb5_db2_free_principal, + (krb5_context ctx, + krb5_db_entry *d, + int i), + (ctx, d, i)); WRAP_K (krb5_db2_put_principal, (krb5_context ctx, krb5_db_entry *d, diff --git a/src/plugins/kdb/db2/kdb_db2.c b/src/plugins/kdb/db2/kdb_db2.c index 3e32a9437..22a913352 100644 --- a/src/plugins/kdb/db2/kdb_db2.c +++ b/src/plugins/kdb/db2/kdb_db2.c @@ -925,7 +925,7 @@ cleanup: /* Free stuff returned by krb5_db2_get_principal. */ -krb5_error_code +void krb5_db2_free_principal(krb5_context context, krb5_db_entry *entries, int nentries) { diff --git a/src/plugins/kdb/db2/kdb_db2.h b/src/plugins/kdb/db2/kdb_db2.h index f31017d10..d7ac7a4cb 100644 --- a/src/plugins/kdb/db2/kdb_db2.h +++ b/src/plugins/kdb/db2/kdb_db2.h @@ -61,7 +61,7 @@ krb5_error_code krb5_db2_get_age(krb5_context, char *, time_t *); krb5_error_code krb5_db2_rename(krb5_context, char *, char *, int ); krb5_error_code krb5_db2_get_principal(krb5_context, krb5_const_principal, krb5_db_entry *, int *, krb5_boolean *); -krb5_error_code krb5_db2_free_principal(krb5_context, krb5_db_entry *, int); +void krb5_db2_free_principal(krb5_context, krb5_db_entry *, int); krb5_error_code krb5_db2_put_principal(krb5_context, krb5_db_entry *, int *, char **db_args); krb5_error_code krb5_db2_iterate_ext(krb5_context, diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c index 5fcc92b68..9128fd5d7 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.c @@ -122,7 +122,7 @@ krb5_dbe_free_contents(krb5_context context, krb5_db_entry *entry) } -krb5_error_code +void krb5_ldap_free_principal(krb5_context kcontext, krb5_db_entry *entries, int nentries) { diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h index 9969d532a..805462d36 100644 --- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h +++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal.h @@ -104,7 +104,7 @@ krb5_ldap_get_principal(krb5_context , krb5_const_principal , krb5_error_code krb5_ldap_delete_principal(krb5_context, krb5_const_principal, int *); -krb5_error_code +void krb5_ldap_free_principal(krb5_context, krb5_db_entry *, int ); krb5_error_code |