Return GSS_S_FAILURE if a non-NULL context handle is passed to it

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10283 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index 71e2cfa618aec0be89989b803ebe2886bacff11c..17ce860eb6fc30a38e3704c12159e03cc25f6e0b 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Sat Nov 15 20:14:05 1997  Theodore Y. Ts'o  <tytso@mit.edu>
+
+       * accept_sec_context.c (krb5_gss_accept_sec_context): Return
+               GSS_S_FAILURE if an context handle is passed to it.
+
 Thu Sep 18 17:55:09 1997  Tom Yu  <tlyu@mit.edu>
 
        * acquire_cred.c: Replace USE_STRING_H with something more sane.

diff --git a/src/lib/gssapi/krb5/accept_sec_context.c b/src/lib/gssapi/krb5/accept_sec_context.c
index 2d4609c48878f899fa184375dd636c798380a0b1..2c7821a30f779730ca6286d2436ceb258eb53251 100644 (file)
--- a/src/lib/gssapi/krb5/accept_sec_context.c
+++ b/src/lib/gssapi/krb5/accept_sec_context.c
@@ -195,12 +195,15 @@ krb5_gss_accept_sec_context(minor_status, context_handle,
    if (delegated_cred_handle)
       *delegated_cred_handle = GSS_C_NO_CREDENTIAL;
 
-   /* context handle must be unspecified */
-
+   /*
+    * Context handle must be unspecified.  Actually, it must be
+    * non-established, but currently, accept_sec_context never returns
+    * a non-established context handle.
+    */
    /*SUPPRESS 29*/
    if (*context_handle != GSS_C_NO_CONTEXT) {
       *minor_status = 0;
-      return(GSS_S_NO_CONTEXT);
+      return(GSS_S_FAILURE);
    }
 
    /* validate the cred handle - no default */