summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorTheodore Tso <tytso@mit.edu>1997-03-25 06:07:51 +0000
committerTheodore Tso <tytso@mit.edu>1997-03-25 06:07:51 +0000
commit3546280503f530047b2320136737f8b2cf500fce (patch)
tree47309f75e368b1f24a0bde2deea57d744acd4634 /src/lib
parent0b21febf6cc4f995b22e95a3d44431900a410f3f (diff)
downloadkrb5-3546280503f530047b2320136737f8b2cf500fce.tar.gz
krb5-3546280503f530047b2320136737f8b2cf500fce.tar.xz
krb5-3546280503f530047b2320136737f8b2cf500fce.zip
A zero-length token should be treated like a GSS_C_NO_BUFFER during
the initial context establishment. [krb5-libs/352] git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10026 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/gssapi/krb5/ChangeLog6
-rw-r--r--src/lib/gssapi/krb5/init_sec_context.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index b8d8e366b0..8bc5e8baf3 100644
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,9 @@
+Tue Mar 25 01:00:55 1997 Theodore Y. Ts'o <tytso@mit.edu>
+
+ * init_sec_context.c (krb5_gss_init_sec_context): A zero-length
+ token should be treated like a GSS_C_NO_BUFFER during the
+ initial context establishment. [krb5-libs/352]
+
Sat Feb 22 18:59:42 1997 Richard Basch <basch@lehman.com>
* Makefile.in: Use some of the new library list build rules in
diff --git a/src/lib/gssapi/krb5/init_sec_context.c b/src/lib/gssapi/krb5/init_sec_context.c
index 2df91205fa..1c6d00a2c4 100644
--- a/src/lib/gssapi/krb5/init_sec_context.c
+++ b/src/lib/gssapi/krb5/init_sec_context.c
@@ -303,9 +303,9 @@ krb5_gss_init_sec_context(minor_status, claimant_cred_handle,
return(GSS_S_NO_CRED);
}
- /* complain if the input token is nonnull */
+ /* complain if the input token is non-null */
- if (input_token != GSS_C_NO_BUFFER) {
+ if (input_token != GSS_C_NO_BUFFER && input_token->length != 0) {
*minor_status = 0;
return(GSS_S_DEFECTIVE_TOKEN);
}