From rra at MIT.EDU Wed Mar 21 00:16:36 2012 From: rra at MIT.EDU (rra@MIT.EDU) Date: Wed, 21 Mar 2012 00:16:36 -0400 Subject: svn rev #3331: trunk/gssftp/ftp/ Message-ID: <201203210416.q2L4GaK3023338@drugstore.mit.edu> Commit By: rra Log Message: Move redeclaration of sig_t after all system includes. Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h after the last system include to keep from stomping on system headers. Required for kFreeBSD and Hurd. Changed Files: U trunk/gssftp/ftp/ftp_var.h Modified: trunk/gssftp/ftp/ftp_var.h =================================================================== --- trunk/gssftp/ftp/ftp_var.h 2012-01-27 20:41:46 UTC (rev 3330) +++ trunk/gssftp/ftp/ftp_var.h 2012-03-21 04:16:36 UTC (rev 3331) @@ -53,15 +53,6 @@ #define PERROR_SOCKET(str) perror(str) #endif -#ifdef _WIN32 -typedef void (*sig_t)(int); -typedef void sigtype; -#else -#define sig_t my_sig_t -#define sigtype krb5_sigtype -typedef sigtype (*sig_t)(); -#endif - /* * FTP global variables. */ @@ -168,6 +159,15 @@ extern struct macel macros[16]; extern char macbuf[4096]; +#ifdef _WIN32 +typedef void (*sig_t)(int); +typedef void sigtype; +#else +#define sig_t my_sig_t +#define sigtype krb5_sigtype +typedef sigtype (*sig_t)(); +#endif + #ifdef DEFINITIONS #undef extern #endif From rra at MIT.EDU Wed Mar 21 00:18:34 2012 From: rra at MIT.EDU (rra@MIT.EDU) Date: Wed, 21 Mar 2012 00:18:34 -0400 Subject: svn rev #3332: trunk/telnet/telnetd/ Message-ID: <201203210418.q2L4IYwe024529@drugstore.mit.edu> Commit By: rra Log Message: Remove include of sys/tty.h in telnetd. Remove the include of sys/tty.h in telnet/telnetd/sys_term.c, which breaks the build on kFreeBSD because it introduces a second competing definition of struct termios. Changed Files: U trunk/telnet/telnetd/sys_term.c Modified: trunk/telnet/telnetd/sys_term.c =================================================================== --- trunk/telnet/telnetd/sys_term.c 2012-03-21 04:16:36 UTC (rev 3331) +++ trunk/telnet/telnetd/sys_term.c 2012-03-21 04:18:34 UTC (rev 3332) @@ -114,10 +114,6 @@ #include #include #endif - /* For what platforms do we really need sys/tty.h? */ -#ifdef HAVE_SYS_TTY_H -#include -#endif #ifdef t_erase #undef t_erase From rra at MIT.EDU Wed Mar 21 00:20:23 2012 From: rra at MIT.EDU (rra@MIT.EDU) Date: Wed, 21 Mar 2012 00:20:23 -0400 Subject: svn rev #3333: trunk/tests/resolve/ Message-ID: <201203210420.q2L4KNBm024708@drugstore.mit.edu> Commit By: rra Log Message: Define MAXHOSTNAMELEN in the resolve test to fix builds on Hurd. Changed Files: U trunk/tests/resolve/resolve.c Modified: trunk/tests/resolve/resolve.c =================================================================== --- trunk/tests/resolve/resolve.c 2012-03-21 04:18:34 UTC (rev 3332) +++ trunk/tests/resolve/resolve.c 2012-03-21 04:20:23 UTC (rev 3333) @@ -64,6 +64,10 @@ #include #include +#ifndef MAXHOSTNAMELEN +# define MAXHOSTNAMELEN 256 +#endif + int main(argc, argv) int argc; From rra at MIT.EDU Wed Mar 21 00:21:13 2012 From: rra at MIT.EDU (rra@MIT.EDU) Date: Wed, 21 Mar 2012 00:21:13 -0400 Subject: svn rev #3334: trunk/gssftp/ftp/ Message-ID: <201203210421.q2L4LDUv025556@drugstore.mit.edu> Commit By: rra Log Message: Fix spelling error in ftp binary. Changed Files: U trunk/gssftp/ftp/cmds.c Modified: trunk/gssftp/ftp/cmds.c =================================================================== --- trunk/gssftp/ftp/cmds.c 2012-03-21 04:20:23 UTC (rev 3333) +++ trunk/gssftp/ftp/cmds.c 2012-03-21 04:21:13 UTC (rev 3334) @@ -262,7 +262,7 @@ if (overbose && !strncmp(reply_string, "215 TOPS20", 10)) printf( -"Remember to set tenex mode when transfering binary files from this machine.\n"); +"Remember to set tenex mode when transferring binary files from this machine.\n"); } verbose = overbose; #else From rra at MIT.EDU Wed Mar 21 00:22:22 2012 From: rra at MIT.EDU (rra@MIT.EDU) Date: Wed, 21 Mar 2012 00:22:22 -0400 Subject: svn rev #3335: trunk/bsd/ Message-ID: <201203210422.q2L4MMCf025911@drugstore.mit.edu> Commit By: rra Log Message: Fix spelling errors in man pages. Changed Files: U trunk/bsd/klogind.M U trunk/bsd/kshd.M Modified: trunk/bsd/klogind.M =================================================================== --- trunk/bsd/klogind.M 2012-03-21 04:21:13 UTC (rev 3334) +++ trunk/bsd/klogind.M 2012-03-21 04:22:22 UTC (rev 3335) @@ -77,7 +77,7 @@ a checksum from an authenticator without making the authenticator invalid, this default mode is almost as significant of a security improvement as \fB-c\fP if new clients are used. It has the additional -advantage of backwards compatability with some clients. +advantage of backwards compatibility with some clients. Unfortunately, clients before Kerberos V5, Beta5, generate invalid checksums; if these clients are used, the \fB-i\fP option must be used. Modified: trunk/bsd/kshd.M =================================================================== --- trunk/bsd/kshd.M 2012-03-21 04:21:13 UTC (rev 3334) +++ trunk/bsd/kshd.M 2012-03-21 04:22:22 UTC (rev 3335) @@ -97,7 +97,7 @@ a checksum from an authenticator without making the authenticator invalid, this default mode is almost as significant of a security improvement as \fB-c\fP if new clients are used. It has the additional -advantage of backwards compatability with some clients. +advantage of backwards compatibility with some clients. Unfortunately, clients before Kerberos V5, Beta5, generate invalid checksums; if these clients are used, the \fB-i\fP option must be used.