summaryrefslogtreecommitdiffstats
path: root/src/appl
diff options
context:
space:
mode:
authorSam Hartman <hartmans@mit.edu>2002-04-11 20:20:24 +0000
committerSam Hartman <hartmans@mit.edu>2002-04-11 20:20:24 +0000
commit726a84d6664f74c196bcb13f3c4d051bd79f806c (patch)
treeca38d2d9b23dd1b149e3b4ad71017b30e6b0f014 /src/appl
parent88cea7a7d1f577e23d73c8e64db8b2d305c84bd1 (diff)
downloadkrb5-726a84d6664f74c196bcb13f3c4d051bd79f806c.tar.gz
krb5-726a84d6664f74c196bcb13f3c4d051bd79f806c.tar.xz
krb5-726a84d6664f74c196bcb13f3c4d051bd79f806c.zip
Don't use channel bindings for accept_sec_context
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14386 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/appl')
-rw-r--r--src/appl/gssftp/ftpd/ChangeLog4
-rw-r--r--src/appl/gssftp/ftpd/ftpd.c11
2 files changed, 5 insertions, 10 deletions
diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 89f3aea4b..7f249f884 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,7 @@
+2002-04-11 Sam Hartman <hartmans@mit.edu>
+
+ * ftpd.c (adata;): Don't use channel bindings in call to gss_accept
+
2002-03-20 Ezra Peisach <epeisach@mit.edu>
* Makefile.in: Remove dependency on krb524.h and krb524_err.h as
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 7c2ea70cd..8f1dba8d7 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -2374,7 +2374,6 @@ char *adata;
gss_name_t client;
int ret_flags;
int rad_len;
- struct gss_channel_bindings_struct chan;
gss_buffer_desc name_buf;
gss_name_t server_name;
OM_uint32 acquire_maj, acquire_min, accept_maj, accept_min,
@@ -2388,14 +2387,6 @@ char *adata;
char **gservice;
struct hostent *hp;
- chan.initiator_addrtype = GSS_C_AF_INET;
- chan.initiator_address.length = 4;
- chan.initiator_address.value = &his_addr.sin_addr.s_addr;
- chan.acceptor_addrtype = GSS_C_AF_INET;
- chan.acceptor_address.length = 4;
- chan.acceptor_address.value = &ctrl_addr.sin_addr.s_addr;
- chan.application_data.length = 0;
- chan.application_data.value = 0;
kerror = radix_encode(adata, gout_buf, &length, 1);
if (kerror) {
@@ -2453,7 +2444,7 @@ char *adata;
&gcontext, /* context_handle */
server_creds, /* verifier_cred_handle */
&tok, /* input_token */
- &chan, /* channel bindings */
+ GSS_C_NO_CHANNEL_BINDINGS, /* channel bindings */
&client, /* src_name */
&mechid, /* mech_type */
&out_tok, /* output_token */