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/appl/gssftp/ftp/main.c | |
| parent | f516bff55492104069d377bb679f4d476ebb6d20 (diff) | |
| download | krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.zip krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.tar.gz krb5-9ba3288bba0786ecf0b510f11a7d9028bcb5de95.tar.bz2 | |
* 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/appl/gssftp/ftp/main.c')
| -rw-r--r-- | src/appl/gssftp/ftp/main.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/appl/gssftp/ftp/main.c b/src/appl/gssftp/ftp/main.c index a73f4fb..6c6cfc5 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 |