diff --git a/lib/hdb/common.c b/lib/hdb/common.c index a2a2c27dc..5a0de29b1 100644 --- a/lib/hdb/common.c +++ b/lib/hdb/common.c @@ -138,7 +138,7 @@ _hdb_store(krb5_context context, HDB *db, int replace, hdb_entry *entry) } krb5_error_code -_hdb_delete(krb5_context context, HDB *db, hdb_entry *entry) +_hdb_remove(krb5_context context, HDB *db, hdb_entry *entry) { krb5_data key; int code; diff --git a/lib/hdb/db.c b/lib/hdb/db.c index ec89bd0cd..55bfa1f5b 100644 --- a/lib/hdb/db.c +++ b/lib/hdb/db.c @@ -239,7 +239,7 @@ hdb_db_create(krb5_context context, HDB **db, (*db)->close = DB_close; (*db)->fetch = _hdb_fetch; (*db)->store = _hdb_store; - (*db)->delete = _hdb_delete; + (*db)->remove = _hdb_remove; (*db)->firstkey = DB_firstkey; (*db)->nextkey= DB_nextkey; (*db)->lock = DB_lock; diff --git a/lib/hdb/hdb.h b/lib/hdb/hdb.h index 4fed35631..43d56546e 100644 --- a/lib/hdb/hdb.h +++ b/lib/hdb/hdb.h @@ -58,7 +58,7 @@ typedef struct HDB{ krb5_error_code (*close)(krb5_context, struct HDB*); krb5_error_code (*fetch)(krb5_context, struct HDB*, hdb_entry*); krb5_error_code (*store)(krb5_context, struct HDB*, int, hdb_entry*); - krb5_error_code (*delete)(krb5_context, struct HDB*, hdb_entry*); + krb5_error_code (*remove)(krb5_context, struct HDB*, hdb_entry*); krb5_error_code (*firstkey)(krb5_context, struct HDB*, hdb_entry*); krb5_error_code (*nextkey)(krb5_context, struct HDB*, hdb_entry*); krb5_error_code (*lock)(krb5_context, struct HDB*, int operation); diff --git a/lib/hdb/hdb_locl.h b/lib/hdb/hdb_locl.h index 9ae8f08e5..27e244a2a 100644 --- a/lib/hdb/hdb_locl.h +++ b/lib/hdb/hdb_locl.h @@ -81,6 +81,6 @@ krb5_error_code hdb_unlock(int); krb5_error_code _hdb_fetch(krb5_context, HDB*, hdb_entry*); krb5_error_code _hdb_store(krb5_context, HDB*, int, hdb_entry*); -krb5_error_code _hdb_delete(krb5_context, HDB*, hdb_entry*); +krb5_error_code _hdb_remove(krb5_context, HDB*, hdb_entry*); #endif /* __HDB_LOCL_H__ */ diff --git a/lib/hdb/ndbm.c b/lib/hdb/ndbm.c index 4334ccb11..f16d056d9 100644 --- a/lib/hdb/ndbm.c +++ b/lib/hdb/ndbm.c @@ -290,7 +290,7 @@ hdb_ndbm_create(krb5_context context, HDB **db, (*db)->close = NDBM_close; (*db)->fetch = _hdb_fetch; (*db)->store = _hdb_store; - (*db)->delete = _hdb_delete; + (*db)->remove = _hdb_remove; (*db)->firstkey = NDBM_firstkey; (*db)->nextkey= NDBM_nextkey; (*db)->lock = NDBM_lock;