* secure.h (myaddr): For secure data stream, pass the port number

 	of the data stream and not the control stream to krb_mk_priv.

This would result in the occasional time out of bounds error when ftping
to the same machine. (mk_priv and rd_priv have some amusing
negating of timestamps depending on address and port of sockets).

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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index ca10ff8f4f116210f47a7cab61e43f5bc4746da7..f319027d750ad1177000f2a2a6c4eaa7ba4c61d4 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 22 17:10:39 2000  Ezra Peisach  <epeisach@mit.edu>
+
+       * secure.h (myaddr): For secure data stream, pass the port number
+       of the data stream and not the control stream to krb_mk_priv.
+
 2000-08-17  Ezra Peisach  <epeisach@mit.edu>
 
        * domacro.c: Compiler warning cleanups and fix the overflow fix to

diff --git a/src/appl/gssftp/ftp/secure.h b/src/appl/gssftp/ftp/secure.h
index 641531daabbc8612a19930eb6640ff9e42ea8947..cb271fcfaea925b2fb71ea759fe08a9c6a79edf0 100644 (file)
--- a/src/appl/gssftp/ftp/secure.h
+++ b/src/appl/gssftp/ftp/secure.h
@@ -2,7 +2,7 @@
 
 #define CRED_DECL      extern CREDENTIALS cred;
 #define SESSION                cred.session
-#define myaddr         myctladdr
+#define myaddr         data_addr
 #define hisaddr                hisdataaddr
 
 #if (defined(__STDC__) || defined(__cplusplus) || defined(_MSDOS) || defined(_WIN32) || defined(KRB5_PROVIDE_PROTOTYPES)) && !defined(KRB5_NO_PROTOTYPES)

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 3a4508cdd387de13b58add559e6e8f876aa0e6ff..5bab683e9c26fd6305e6253d5cdd81a79b48491c 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,5 +1,8 @@
 Tue Aug 22 11:37:35 2000  Ezra Peisach  <epeisach@mit.edu>
 
+       * secure.h (myaddr): For secure data stream, pass the port number
+       of the data stream and not the control stream to krb_mk_priv.
+
        * ftpd.c (auth_data): Iterate over all krb4 services instead of
        trying to examine the srvtab file for a particular key (which
        failes when falling back on the v5 keytab for des3 services).

diff --git a/src/appl/gssftp/ftpd/secure.h b/src/appl/gssftp/ftpd/secure.h
index d7344791d7d489d2737804338fcfda89e7bf8243..a249998afeebddb3d8b3a30716e63e313475ba72 100644 (file)
--- a/src/appl/gssftp/ftpd/secure.h
+++ b/src/appl/gssftp/ftpd/secure.h
@@ -1,4 +1,4 @@
 #define CRED_DECL      extern AUTH_DAT kdata;
 #define SESSION                &kdata.session
-#define myaddr         ctrl_addr
+#define myaddr         data_source
 #define hisaddr                data_dest