diff options
| author | Greg Hudson <ghudson@mit.edu> | 2012-09-13 13:00:15 -0400 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2012-09-13 13:00:15 -0400 |
| commit | 7f8f693a439810569bd869c7b3975f9dd03f4d43 (patch) | |
| tree | 4af3ee37cf919575ab49aedaba76ffc06edee120 /src/plugins | |
| parent | d81d68ebd8ade84e240f7d95edf0a562f6931ea2 (diff) | |
| download | krb5-7f8f693a439810569bd869c7b3975f9dd03f4d43.tar.gz krb5-7f8f693a439810569bd869c7b3975f9dd03f4d43.tar.xz krb5-7f8f693a439810569bd869c7b3975f9dd03f4d43.zip | |
Remove osa_adb_rename_db
This function wasn't used anywhere. Also remove the declaration for
osa_adb_close_policy(), which doesn't exist.
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/kdb/db2/adb_openclose.c | 48 | ||||
| -rw-r--r-- | src/plugins/kdb/db2/policy_db.h | 3 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/plugins/kdb/db2/adb_openclose.c b/src/plugins/kdb/db2/adb_openclose.c index 0301c94f6d..abb04445ca 100644 --- a/src/plugins/kdb/db2/adb_openclose.c +++ b/src/plugins/kdb/db2/adb_openclose.c @@ -61,54 +61,6 @@ osa_adb_destroy_db(char *filename, char *lockfilename, int magic) } krb5_error_code -osa_adb_rename_db(char *filefrom, char *lockfrom, char *fileto, char *lockto, - int magic) -{ - osa_adb_db_t fromdb, todb; - krb5_error_code ret; - - /* make sure todb exists */ - if ((ret = osa_adb_create_db(fileto, lockto, magic)) && - ret != EEXIST) - return ret; - - if ((ret = osa_adb_init_db(&fromdb, filefrom, lockfrom, magic))) - return ret; - if ((ret = osa_adb_init_db(&todb, fileto, lockto, magic))) { - (void) osa_adb_fini_db(fromdb, magic); - return ret; - } - if ((ret = osa_adb_get_lock(fromdb, KRB5_DB_LOCKMODE_PERMANENT))) { - (void) osa_adb_fini_db(fromdb, magic); - (void) osa_adb_fini_db(todb, magic); - return ret; - } - if ((ret = osa_adb_get_lock(todb, KRB5_DB_LOCKMODE_PERMANENT))) { - (void) osa_adb_fini_db(fromdb, magic); - (void) osa_adb_fini_db(todb, magic); - return ret; - } - if ((rename(filefrom, fileto) < 0)) { - (void) osa_adb_fini_db(fromdb, magic); - (void) osa_adb_fini_db(todb, magic); - return errno; - } - /* - * Do not release the lock on fromdb because it is being renamed - * out of existence; no one can ever use it again. - */ - if ((ret = osa_adb_release_lock(todb))) { - (void) osa_adb_fini_db(fromdb, magic); - (void) osa_adb_fini_db(todb, magic); - return ret; - } - - (void) osa_adb_fini_db(fromdb, magic); - (void) osa_adb_fini_db(todb, magic); - return 0; -} - -krb5_error_code osa_adb_init_db(osa_adb_db_t *dbp, char *filename, char *lockfilename, int magic) { diff --git a/src/plugins/kdb/db2/policy_db.h b/src/plugins/kdb/db2/policy_db.h index 07026e35a0..87429b94d4 100644 --- a/src/plugins/kdb/db2/policy_db.h +++ b/src/plugins/kdb/db2/policy_db.h @@ -74,8 +74,6 @@ typedef struct _osa_adb_db_ent_t { krb5_error_code osa_adb_create_db(char *filename, char *lockfile, int magic); krb5_error_code osa_adb_destroy_db(char *filename, char *lockfile, int magic); -krb5_error_code osa_adb_rename_db(char *filefrom, char *lockfrom, - char *fileto, char *lockto, int magic); krb5_error_code osa_adb_init_db(osa_adb_db_t *dbp, char *filename, char *lockfile, int magic); krb5_error_code osa_adb_fini_db(osa_adb_db_t db, int magic); @@ -83,7 +81,6 @@ krb5_error_code osa_adb_get_lock(osa_adb_db_t db, int mode); krb5_error_code osa_adb_release_lock(osa_adb_db_t db); krb5_error_code osa_adb_open_and_lock(osa_adb_princ_t db, int locktype); krb5_error_code osa_adb_close_and_unlock(osa_adb_princ_t db); -krb5_error_code osa_adb_close_policy(osa_adb_policy_t db); krb5_error_code osa_adb_create_policy(osa_adb_policy_t db, osa_policy_ent_t entry); krb5_error_code osa_adb_destroy_policy(osa_adb_policy_t db, |