diff options
| author | Ezra Peisach <epeisach@mit.edu> | 2000-08-22 21:12:32 +0000 |
|---|---|---|
| committer | Ezra Peisach <epeisach@mit.edu> | 2000-08-22 21:12:32 +0000 |
| commit | 20d06dd54200d1819dcf6ea0f8925db70de075d2 (patch) | |
| tree | 4621efd95832415b65fb9713567976c96c1709f4 | |
| parent | 62562bc0c81eec62d2dcbfeec1de0e6f1a5262bc (diff) | |
| download | krb5-20d06dd54200d1819dcf6ea0f8925db70de075d2.tar.gz krb5-20d06dd54200d1819dcf6ea0f8925db70de075d2.tar.xz krb5-20d06dd54200d1819dcf6ea0f8925db70de075d2.zip | |
* 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
| -rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 5 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/secure.h | 2 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/ChangeLog | 3 | ||||
| -rw-r--r-- | src/appl/gssftp/ftpd/secure.h | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index ca10ff8f4..f319027d7 100644 --- 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 641531daa..cb271fcfa 100644 --- 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 3a4508cdd..5bab683e9 100644 --- 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 d7344791d..a249998af 100644 --- 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 |