summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorTom Yu <tlyu@mit.edu>2003-03-01 22:15:22 +0000
committerTom Yu <tlyu@mit.edu>2003-03-01 22:15:22 +0000
commit95d8dd623b6ad9e15cc611d0a26971ac873c7556 (patch)
tree8ce54c92a89739be4c84221c57d0d5b4cde96347 /src/lib
parentb8042b1df4dce8dfe3b9cf9802ff7655ac8a87c1 (diff)
There isn't really a point to validating cred_handle if it was just
acquired by acquire_cred(), so instead of the suggested patch, validate verifier_cred_handle only if we didn't acquire_cred(). * accept_sec_context.c (krb5_gss_accept_sec_context): Don't validate verifier_cred_handle if GSS_C_NO_CREDENTIAL is passed in. ticket: 1356 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15211 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/krb5/ChangeLog5
-rw-r--r--src/lib/gssapi/krb5/accept_sec_context.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 65ecfc1f5..b85af053e 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-01 Tom Yu <tlyu@mit.edu>
+
+ * accept_sec_context.c (krb5_gss_accept_sec_context): Don't
+ validate verifier_cred_handle if GSS_C_NO_CREDENTIAL is passed in.
+
2003-02-25 Tom Yu <tlyu@mit.edu>
* set_ccache.c (gss_krb5_ccache_name): Don't return a pointer to
diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index c0efb3db1..be212b526 100644
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -284,15 +284,15 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
goto fail;
}
} else {
+ major_status = krb5_gss_validate_cred(minor_status,
+ verifier_cred_handle);
+ if (GSS_ERROR(major_status)) {
+ code = *minor_status;
+ goto fail;
+ }
cred_handle = verifier_cred_handle;
}
- major_status = krb5_gss_validate_cred(minor_status, verifier_cred_handle);
- if (GSS_ERROR(major_status)) {
- code = *minor_status;
- goto fail;
- }
-
cred = (krb5_gss_cred_id_t) cred_handle;
/* make sure the supplied credentials are valid for accept */