diff options
| author | Tom Yu <tlyu@mit.edu> | 2002-08-15 20:49:08 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2002-08-15 20:49:08 +0000 |
| commit | e8269931299293e22180a2abf6da5ddbd4663676 (patch) | |
| tree | abfa931b4df40dcdba43a5123182ae1ae278cbd7 /src | |
| parent | 39cbdfcf334c5d19be70a2ce5e8d7b5c392e5d3f (diff) | |
| download | krb5-e8269931299293e22180a2abf6da5ddbd4663676.tar.gz krb5-e8269931299293e22180a2abf6da5ddbd4663676.tar.xz krb5-e8269931299293e22180a2abf6da5ddbd4663676.zip | |
* keytab.c (krb5_ktkdb_get_entry): For consistency, check for
DISALLOW_ALL_TIX and DISALLOW_SVR when looking up keys.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14727 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/kdb/ChangeLog | 5 | ||||
| -rw-r--r-- | src/lib/kdb/keytab.c | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/lib/kdb/ChangeLog b/src/lib/kdb/ChangeLog index 24f7e51de2..a790596ad1 100644 --- a/src/lib/kdb/ChangeLog +++ b/src/lib/kdb/ChangeLog @@ -1,3 +1,8 @@ +2002-08-15 Tom Yu <tlyu@mit.edu> + + * keytab.c (krb5_ktkdb_get_entry): For consistency, check for + DISALLOW_ALL_TIX and DISALLOW_SVR when looking up keys. + 2002-08-09 Sam Hartman <hartmans@mit.edu> * kdb_xdr.c (krb5_dbe_search_enctype): Initialize ret to 0; thanks diff --git a/src/lib/kdb/keytab.c b/src/lib/kdb/keytab.c index f8077324b9..9c9b3b3bd8 100644 --- a/src/lib/kdb/keytab.c +++ b/src/lib/kdb/keytab.c @@ -116,6 +116,12 @@ krb5_ktkdb_get_entry(context, id, principal, kvno, enctype, entry) return KRB5_KT_NOTFOUND; } + if (db_entry.attributes & KRB5_KDB_DISALLOW_SVR + || db_entry.attributes & KRB5_KDB_DISALLOW_ALL_TIX) { + kerror = KRB5_KT_NOTFOUND; + goto error; + } + /* match key */ kerror = krb5_db_get_mkey(context, &master_key); if (kerror) |