diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-07-07 20:00:27 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-07-07 20:00:27 +0000 |
| commit | 89c99be21de1c60dec9c123a46a334ad8321317f (patch) | |
| tree | 1bd4224ef8c1d28217440515c5a81459785e8b46 /src | |
| parent | 5d8bfcbf90e2c8c8423b6810e73f0a62ecdbd76c (diff) | |
| download | krb5-89c99be21de1c60dec9c123a46a334ad8321317f.zip krb5-89c99be21de1c60dec9c123a46a334ad8321317f.tar.gz krb5-89c99be21de1c60dec9c123a46a334ad8321317f.tar.bz2 | |
pullup from trunk
ticket: 2624
version_fixed: 1.3.5
git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-3@16556 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/krb5/ccache/ChangeLog | 18 | ||||
| -rw-r--r-- | src/lib/krb5/ccache/cc_mslsa.c | 1 |
2 files changed, 19 insertions, 0 deletions
diff --git a/src/lib/krb5/ccache/ChangeLog b/src/lib/krb5/ccache/ChangeLog index dd377b0..369cd91 100644 --- a/src/lib/krb5/ccache/ChangeLog +++ b/src/lib/krb5/ccache/ChangeLog @@ -1,3 +1,21 @@ +2004-06-30 Ken Raeburn <raeburn@mit.edu> + + * cc_file.c (krb5_fcc_data): Added a mutex. + (krb5_fcc_read*, krb5_fcc_write, krb5_fcc_store_*, + krb5_fcc_open_file, krb5_fcc_skip_header, + krb5_fcc_skip_principal): Verify that the mutex is locked. + (MAYBE_OPEN): Verify that the mutex is locked; unlock it if + returning an error. + (krb5_fcc_initialize, krb5_fcc_start_seq_get, + krb5_fcc_get_principal, krb5_fcc_store, krb5_fcc_set_flags): Lock + and unlock the mutex. + (krb5_fcc_close): Likewise. Destroy the mutex when done. + (krb5_fcc_destroy): Merge stdio and non-stdio versions a little + more. Destroy the mutex when done. + (krb5_fcc_resolve): Initialize and lock the mutex. + (krb5_fcc_next_cred): Lock and unlock the mutex. Merge the stdio + and non-stdio branches a little more. + 2004-06-29 Jeffrey Altman <jaltman@mit.edu> * cc_mslsa.c: diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c index 3ab99cf..8fd278e 100644 --- a/src/lib/krb5/ccache/cc_mslsa.c +++ b/src/lib/krb5/ccache/cc_mslsa.c @@ -850,6 +850,7 @@ GetMSTGT(krb5_context context, HANDLE LogonHandle, ULONG PackageId, KERB_EXTERNA #else /* Check Supported Enctypes */ if ( !enforce_tgs_enctypes || + pTicketResponse->Ticket.SessionKey.KeyType == KERB_ETYPE_NULL || krb5_is_permitted_tgs_enctype(context, NULL, pTicketResponse->Ticket.SessionKey.KeyType) ) { FILETIME Now, MinLife, EndTime, LocalEndTime; __int64 temp; |