[27022] in CVS-changelog-for-Kerberos-V5
krb5 commit: Remove osa_adb_rename_db
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Sep 13 13:01:43 2012
Date: Thu, 13 Sep 2012 13:01:29 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201209131701.q8DH1Tff032060@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/7f8f693a439810569bd869c7b3975f9dd03f4d43
commit 7f8f693a439810569bd869c7b3975f9dd03f4d43
Author: Greg Hudson <ghudson@mit.edu>
Date: Thu Sep 13 13:00:15 2012 -0400
Remove osa_adb_rename_db
This function wasn't used anywhere. Also remove the declaration for
osa_adb_close_policy(), which doesn't exist.
src/plugins/kdb/db2/adb_openclose.c | 48 -----------------------------------
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 0301c94..abb0444 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 07026e3..87429b9 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,
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
