Don't use channel bindings for accept_sec_context

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 89f3aea4bf0667d333fdedf440f8f39eb78e0a5a..7f249f884a44ca43af13cf36394b499a4f233f7e 100644 (file)
--- 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 7c2ea70cd6a701f06a4b287f6efdf830174affb7..8f1dba8d78edddca5241702c01778ca7913873f3 100644 (file)
--- 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 */