From 86b9f9988108714a833cd48dcfba6901c6a733a6 Mon Sep 17 00:00:00 2001 From: Johan Danielsson Date: Mon, 3 May 1999 16:52:23 +0000 Subject: [PATCH] add flags to NDBM_seq, NDBM_firstkey, and NDBM_nextkey git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@6090 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/hdb/ndbm.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/hdb/ndbm.c b/lib/hdb/ndbm.c index 67f16fc77..f350a2d23 100644 --- a/lib/hdb/ndbm.c +++ b/lib/hdb/ndbm.c @@ -73,7 +73,8 @@ NDBM_unlock(krb5_context context, HDB *db) } static krb5_error_code -NDBM_seq(krb5_context context, HDB *db, hdb_entry *entry, int first) +NDBM_seq(krb5_context context, HDB *db, + unsigned flags, hdb_entry *entry, int first) { struct ndbm_db *d = (struct ndbm_db *)db->db; @@ -96,9 +97,9 @@ NDBM_seq(krb5_context context, HDB *db, hdb_entry *entry, int first) data.data = value.dptr; data.length = value.dsize; if(hdb_value2entry(context, &data, entry)) - return NDBM_seq(context, db, entry, 0); - if (db->master_key_set) - hdb_unseal_keys (entry, db->master_key); + return NDBM_seq(context, db, flags, entry, 0); + if (db->master_key_set && (flags & HDB_F_DECRYPT)) + hdb_unseal_keys (db, entry); if (entry->principal == NULL) { entry->principal = malloc (sizeof(*entry->principal)); hdb_key2principal (context, &key_data, entry->principal); @@ -108,16 +109,16 @@ NDBM_seq(krb5_context context, HDB *db, hdb_entry *entry, int first) static krb5_error_code -NDBM_firstkey(krb5_context context, HDB *db, hdb_entry *entry) +NDBM_firstkey(krb5_context context, HDB *db, unsigned flags, hdb_entry *entry) { - return NDBM_seq(context, db, entry, 1); + return NDBM_seq(context, db, flags, entry, 1); } static krb5_error_code -NDBM_nextkey(krb5_context context, HDB *db, hdb_entry *entry) +NDBM_nextkey(krb5_context context, HDB *db, unsigned flags, hdb_entry *entry) { - return NDBM_seq(context, db, entry, 0); + return NDBM_seq(context, db, flags, entry, 0); } static krb5_error_code