diff options
| author | Tom Yu <tlyu@mit.edu> | 1997-12-12 04:27:57 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 1997-12-12 04:27:57 +0000 |
| commit | 9ba3288bba0786ecf0b510f11a7d9028bcb5de95 (patch) | |
| tree | 3262126c475d02d1a132bde4b4da0fb0a7b7fbef /src | |
| parent | f516bff55492104069d377bb679f4d476ebb6d20 (diff) | |
| download | krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.tar.gz krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.tar.xz krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.zip | |
* ftp.c:
* main.c: Don't include netdb.h or sys/socket.h if krb.h is
included; this works around an Ultrix bug where those headers
aren't protected against multiple inclusion.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@10332 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/appl/gssftp/ftp/ChangeLog | 7 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/ftp.c | 6 | ||||
| -rw-r--r-- | src/appl/gssftp/ftp/main.c | 6 |
3 files changed, 19 insertions, 0 deletions
diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 64cf0d0caa..34d61bcd2e 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,10 @@ +Thu Dec 11 23:26:58 1997 Tom Yu <tlyu@mit.edu> + + * ftp.c: + * main.c: Don't include netdb.h or sys/socket.h if krb.h is + included; this works around an Ultrix bug where those headers + aren't protected against multiple inclusion. + Thu Oct 16 01:20:30 1997 Tom Yu <tlyu@mit.edu> * main.c: Change KERBEROS to KRB5_KRB4_COMPAT where appropriate. diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c index 41207c06a8..3d2f07a368 100644 --- a/src/appl/gssftp/ftp/ftp.c +++ b/src/appl/gssftp/ftp/ftp.c @@ -41,7 +41,10 @@ static char sccsid[] = "@(#)ftp.c 5.38 (Berkeley) 4/22/91"; #include <sys/param.h> #include <sys/stat.h> #include <sys/ioctl.h> +#ifndef KRB5_KRB4_COMPAT +/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */ #include <sys/socket.h> +#endif #include <sys/time.h> #include <sys/file.h> #ifdef HAVE_SYS_SELECT_H @@ -58,7 +61,10 @@ static char sccsid[] = "@(#)ftp.c 5.38 (Berkeley) 4/22/91"; #include <signal.h> #include <string.h> #include <errno.h> +#ifndef KRB5_KRB4_COMPAT +/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */ #include <netdb.h> +#endif #include <fcntl.h> #include <pwd.h> #ifndef STDARG diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c index a73f4fb933..6c6cfc5f12 100644 --- a/src/appl/gssftp/ftp/main.c +++ b/src/appl/gssftp/ftp/main.c @@ -46,7 +46,10 @@ static char sccsid[] = "@(#)main.c 5.18 (Berkeley) 3/1/91"; */ #include <stdio.h> #include "ftp_var.h" +#ifndef KRB5_KRB4_COMPAT +/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */ #include <sys/socket.h> +#endif #include <sys/ioctl.h> #include <sys/types.h> @@ -56,7 +59,10 @@ static char sccsid[] = "@(#)main.c 5.18 (Berkeley) 3/1/91"; #include <string.h> #include <errno.h> #include <ctype.h> +#ifndef KRB5_KRB4_COMPAT +/* krb.h gets this, and Ultrix doesn't protect vs multiple inclusion */ #include <netdb.h> +#endif #include <pwd.h> #define sig_t my_sig_t |