[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Heimdal on ULTRIX



On Thu, Aug 05, 1999 at 12:00:38PM +0200, Assar Westerlund wrote:
> Brian A May <bmay@dgs.monash.edu.au> writes:
> > Several days ago, I started compiling Heimdal 0.1l on my MIP Ultrix 4.4
> > workstation (no - it is not very fast). So far, I have routinely
> > encountered two problems (ie Ultrix brokenness) with include files -
> 
> We used to say that if your code built and worked on both Ultrix and
> Unicos you could be pretty sure it would work on any Unix. :-)

I don't know about Unicos, but I 100% agree with Ultrix :-)

> > 2. <syslog.h> only includes some definitions. <sys/syslog.h> is required
> > for other definitions. Actually, the two files overlap and produce
> > a lot of warnings, but at least these aren't errors.
> 
> Hm, I don't remember having seen this before.

This problem only occured in one file: lib/krb5/log.c.

> > Also: linking kadmin fails because strptime is undefined.
> 
> Hm, another function to implement in roken.

I have included the diff file of all my changes so far. I *think*
my changes should work for all platforms, except for lib/krb5/log.c,
where I have hardcoded a reference to sys/syslog.h.

Everything compiles and links now except for kadmin. The build
directory (not including source) is approx 165Meg. ARRRGGGHHH!
Would be nice if Ultrix supported shared libraries ;-)

gmake check doesn't work, I am not sure why:

[580] [dec16:bmay] ~/heimdal/build >gmake check
cd .. && /tmp_mnt/u/postg1/bmay/heimdal/missing aclocal -I ../cf
cd .. && /tmp_mnt/u/postg1/bmay/heimdal/missing automake --foreign Makefile
cd .. && /tmp_mnt/u/postg1/bmay/heimdal/missing autoconf
Making check in include
gmake[1]: Entering directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include'
cd ../.. && /tmp_mnt/u/postg1/bmay/heimdal/missing automake --foreign include/Makefile
Making check in kadm5
gmake[2]: Entering directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include/kadm5'
cd ../../.. && /tmp_mnt/u/postg1/bmay/heimdal/missing automake --foreign include/kadm5/Makefile
gmake  check-local
gmake[3]: Entering directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include/kadm5'
cd ../../.. && /tmp_mnt/u/postg1/bmay/heimdal/missing automake --foreign include/kadm5/Makefile
gmake[3]: *** [check-local] Error 1
gmake[3]: Leaving directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include/kadm5'
gmake[2]: *** [check-am] Error 2
gmake[2]: Leaving directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include/kadm5'
gmake[1]: *** [check-recursive] Error 1
gmake[1]: Leaving directory `/tmp_mnt/u/postg1/bmay/heimdal/build/include'
gmake: *** [check-recursive] Error 1

-- 
Brian May <bmay@csse.monash.edu.au>
Index: heimdal/appl/ftp/common/buffer.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/common/buffer.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 buffer.c
*** heimdal/appl/ftp/common/buffer.c	1999/07/24 07:33:41	1.1.1.1
--- heimdal/appl/ftp/common/buffer.c	1999/08/10 03:17:39
***************
*** 39,45 ****
  #include "common.h"
  #include <stdio.h>
  #include <err.h>
- #include "roken.h"
  
  RCSID("$Id: buffer.c,v 1.2 1997/12/14 23:51:45 assar Exp $");
  
--- 39,44 ----
Index: heimdal/appl/ftp/common/common.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/common/common.h,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 common.h
*** heimdal/appl/ftp/common/common.h	1999/08/06 00:09:18	1.1.1.3
--- heimdal/appl/ftp/common/common.h	1999/08/10 03:17:39
***************
*** 45,50 ****
--- 45,51 ----
  #ifndef __COMMON_H__
  #define __COMMON_H__
  
+ #include "roken.h"
  #include "base64.h"
  
  void set_buffer_size(int, int);
***************
*** 55,63 ****
  #endif
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
- #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
  #endif
  
  void *alloc_buffer (void *oldbuf, size_t *sz, struct stat *st);
--- 56,61 ----
Index: heimdal/appl/ftp/common/sockbuf.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/common/sockbuf.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 sockbuf.c
*** heimdal/appl/ftp/common/sockbuf.c	1999/07/24 07:33:41	1.1.1.1
--- heimdal/appl/ftp/common/sockbuf.c	1999/08/10 03:17:39
***************
*** 40,48 ****
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  
  RCSID("$Id: sockbuf.c,v 1.2 1997/05/11 10:01:48 assar Exp $");
  
--- 40,45 ----
Index: heimdal/appl/ftp/ftp/ftp_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftp/ftp_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 ftp_locl.h
*** heimdal/appl/ftp/ftp/ftp_locl.h	1999/07/24 07:33:42	1.1.1.1
--- heimdal/appl/ftp/ftp/ftp_locl.h	1999/08/10 03:17:40
***************
*** 80,88 ****
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
--- 80,85 ----
***************
*** 107,115 ****
  #include <errno.h>
  #include <ctype.h>
  #include <glob.h>
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  
  #ifdef HAVE_SYS_MMAN_H
  #include <sys/mman.h>
--- 104,109 ----
Index: heimdal/appl/ftp/ftpd/extern.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftpd/extern.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 extern.h
*** heimdal/appl/ftp/ftpd/extern.h	1999/07/30 01:18:07	1.1.1.2
--- heimdal/appl/ftp/ftpd/extern.h	1999/08/10 03:17:41
***************
*** 42,50 ****
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  
  #include <stdio.h>
  #include <stdarg.h>
--- 42,47 ----
Index: heimdal/appl/ftp/ftpd/ftpd_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/ftp/ftpd/ftpd_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 ftpd_locl.h
*** heimdal/appl/ftp/ftpd/ftpd_locl.h	1999/07/24 08:24:37	1.1.1.2
--- heimdal/appl/ftp/ftpd/ftpd_locl.h	1999/08/10 03:17:41
***************
*** 57,65 ****
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #if defined(HAVE_SYS_IOCTL_H) && SunOS != 40
  #include <sys/ioctl.h>
  #endif
--- 57,62 ----
***************
*** 142,149 ****
  #include "common.h"
  
  #include "security.h"
- 
- #include "roken.h"
  
  #ifdef KRB4
  #include <krb.h>
--- 139,144 ----
Index: heimdal/appl/kf/kf_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/kf/kf_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 kf_locl.h
*** heimdal/appl/kf/kf_locl.h	1999/07/24 08:24:15	1.1.1.1
--- heimdal/appl/kf/kf_locl.h	1999/08/10 03:17:41
***************
*** 51,59 ****
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 51,56 ----
***************
*** 66,74 ****
  
  #ifdef HAVE_PWD_H
  #include <pwd.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef HAVE_SYS_PARAM_H
  #include <sys/param.h>
--- 63,68 ----
Index: heimdal/appl/kx/kx.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/kx/kx.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 kx.h
*** heimdal/appl/kx/kx.h	1999/07/24 08:24:31	1.1.1.2
--- heimdal/appl/kx/kx.h	1999/08/10 03:17:42
***************
*** 83,91 ****
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 83,88 ----
***************
*** 94,102 ****
  #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef HAVE_SYS_UN_H
  #include <sys/un.h>
--- 91,96 ----
Index: heimdal/appl/login/login_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/login/login_locl.h,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 login_locl.h
*** heimdal/appl/login/login_locl.h	1999/08/06 00:09:02	1.1.1.3
--- heimdal/appl/login/login_locl.h	1999/08/10 03:17:42
***************
*** 56,64 ****
  #include <pwd.h>
  #include <roken.h>
  #include <getarg.h>
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_PATHS_H
  #include <paths.h>
  #endif
--- 56,61 ----
Index: heimdal/appl/popper/popper.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/popper/popper.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 popper.h
*** heimdal/appl/popper/popper.h	1999/07/24 07:33:40	1.1.1.1
--- heimdal/appl/popper/popper.h	1999/08/10 03:17:44
***************
*** 67,75 ****
  #ifdef HAVE_SYS_WAIT_H
  #include <sys/wait.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 67,72 ----
***************
*** 80,88 ****
  #include <netinet6/in6.h>
  #endif
  
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
  #endif
--- 77,82 ----
Index: heimdal/appl/push/push_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/push/push_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 push_locl.h
*** heimdal/appl/push/push_locl.h	1999/07/24 07:33:40	1.1.1.1
--- heimdal/appl/push/push_locl.h	1999/08/10 03:17:45
***************
*** 66,74 ****
  #ifdef HAVE_SYS_UIO_H
  #include <sys/uio.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 66,71 ----
***************
*** 80,88 ****
  #endif
  #ifdef HAVE_NETINET_TCP_H
  #include <netinet/tcp.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef HAVE_PWD_H
  #include <pwd.h>
--- 77,82 ----
Index: heimdal/appl/rsh/rsh_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/rsh/rsh_locl.h,v
retrieving revision 1.1.1.4
diff -c -r1.1.1.4 rsh_locl.h
*** heimdal/appl/rsh/rsh_locl.h	1999/08/06 00:09:03	1.1.1.4
--- heimdal/appl/rsh/rsh_locl.h	1999/08/10 03:17:45
***************
*** 58,66 ****
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 58,63 ----
***************
*** 79,87 ****
  #endif
  #ifdef HAVE_SHADOW_H
  #include <shadow.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #include <errno.h>
  
--- 76,81 ----
Index: heimdal/appl/telnet/libtelnet/kerberos5.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/libtelnet/kerberos5.c,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 kerberos5.c
*** heimdal/appl/telnet/libtelnet/kerberos5.c	1999/07/24 08:24:20	1.1.1.2
--- heimdal/appl/telnet/libtelnet/kerberos5.c	1999/08/10 03:17:48
***************
*** 62,68 ****
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
- #include <netdb.h>
  #include <ctype.h>
  #include <pwd.h>
  #define Authenticator k5_Authenticator
--- 62,67 ----
Index: heimdal/appl/telnet/telnet/telnet_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnet/telnet_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 telnet_locl.h
*** heimdal/appl/telnet/telnet/telnet_locl.h	1999/07/24 08:24:24	1.1.1.2
--- heimdal/appl/telnet/telnet/telnet_locl.h	1999/08/10 03:17:49
***************
*** 85,94 ****
  #include <fcntl.h>
  #endif
  
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
- 
  #ifdef HAVE_PWD_H
  #include <pwd.h>
  #endif
--- 85,90 ----
***************
*** 122,130 ****
  #endif
  #ifdef HAVE_SYS_FILE_H
  #include <sys/file.h>
- #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
  #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
--- 118,123 ----
Index: heimdal/appl/telnet/telnetd/telnetd.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/telnet/telnetd/telnetd.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 telnetd.h
*** heimdal/appl/telnet/telnetd/telnetd.h	1999/07/24 08:24:26	1.1.1.2
--- heimdal/appl/telnet/telnetd/telnetd.h	1999/08/10 03:17:49
***************
*** 48,56 ****
  #include <sys/param.h>
  #endif
  
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef TIME_WITH_SYS_TIME
  #include <sys/time.h>
  #include <time.h>
--- 48,53 ----
***************
*** 104,112 ****
  
  #include <signal.h>
  #include <errno.h>
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_SYSLOG_H
  #include <syslog.h>
  #endif
--- 101,106 ----
Index: heimdal/appl/test/test_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/appl/test/test_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 test_locl.h
*** heimdal/appl/test/test_locl.h	1999/07/24 07:33:35	1.1.1.1
--- heimdal/appl/test/test_locl.h	1999/08/10 03:17:50
***************
*** 51,59 ****
  #ifdef HAVE_UNISTD_H
  #include <unistd.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 51,56 ----
***************
*** 66,74 ****
  
  #ifdef HAVE_PWD_H
  #include <pwd.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef HAVE_SYS_PARAM_H
  #include <sys/param.h>
--- 63,68 ----
Index: heimdal/kadmin/kadmin_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/kadmin/kadmin_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 kadmin_locl.h
*** heimdal/kadmin/kadmin_locl.h	1999/07/24 08:24:54	1.1.1.2
--- heimdal/kadmin/kadmin_locl.h	1999/08/10 03:17:51
***************
*** 57,65 ****
  #ifdef HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 57,62 ----
***************
*** 70,78 ****
  #include <netinet6/in6.h>
  #endif
  
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_SYS_UN_H
  #include <sys/un.h>
  #endif
--- 67,72 ----
Index: heimdal/kdc/headers.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/kdc/headers.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 headers.h
*** heimdal/kdc/headers.h	1999/07/24 07:33:50	1.1.1.1
--- heimdal/kdc/headers.h	1999/08/10 03:17:52
***************
*** 61,69 ****
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 61,66 ----
***************
*** 75,83 ****
  #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #include <err.h>
  #include <roken.h>
--- 72,77 ----
Index: heimdal/kpasswd/kpasswd_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/kpasswd/kpasswd_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 kpasswd_locl.h
*** heimdal/kpasswd/kpasswd_locl.h	1999/07/24 07:33:51	1.1.1.1
--- heimdal/kpasswd/kpasswd_locl.h	1999/08/10 03:17:54
***************
*** 69,77 ****
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 69,74 ----
***************
*** 84,92 ****
  
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef HAVE_ERRNO_H
  #include <errno.h>
--- 81,86 ----
Index: heimdal/kuser/kuser_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/kuser/kuser_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 kuser_locl.h
*** heimdal/kuser/kuser_locl.h	1999/07/24 08:24:59	1.1.1.2
--- heimdal/kuser/kuser_locl.h	1999/08/10 03:17:55
***************
*** 58,66 ****
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 58,63 ----
Index: heimdal/lib/kadm5/init_c.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/kadm5/init_c.c,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 init_c.c
*** heimdal/lib/kadm5/init_c.c	1999/07/24 08:25:08	1.1.1.2
--- heimdal/lib/kadm5/init_c.c	1999/08/10 03:18:00
***************
*** 38,46 ****
  
  #include "kadm5_locl.h"
  #include <sys/types.h>
- #include <sys/socket.h>
  #include <netinet/in.h>
- #include <netdb.h>
  
  RCSID("$Id: init_c.c,v 1.25 1999/07/07 10:05:41 assar Exp $");
  
--- 38,44 ----
Index: heimdal/lib/kadm5/kadm5_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/kadm5/kadm5_locl.h,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 kadm5_locl.h
*** heimdal/lib/kadm5/kadm5_locl.h	1999/07/24 07:33:55	1.1.1.1
--- heimdal/lib/kadm5/kadm5_locl.h	1999/08/10 03:18:00
***************
*** 68,81 ****
  #ifdef HAVE_SYS_FILE_H
  #include <sys/file.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_SYS_UN_H
  #include <sys/un.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #include <fnmatch.h>
  #include "admin.h"
--- 68,75 ----
Index: heimdal/lib/kafs/kafs_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/kafs/kafs_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 kafs_locl.h
*** heimdal/lib/kafs/kafs_locl.h	1999/07/24 08:25:36	1.1.1.2
--- heimdal/lib/kafs/kafs_locl.h	1999/08/10 03:18:00
***************
*** 68,76 ****
  #ifdef HAVE_SYS_SYSCALL_H
  #include <sys/syscall.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 68,73 ----
Index: heimdal/lib/krb5/krb5_locl.h
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/krb5/krb5_locl.h,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 krb5_locl.h
*** heimdal/lib/krb5/krb5_locl.h	1999/07/24 08:25:14	1.1.1.2
--- heimdal/lib/krb5/krb5_locl.h	1999/08/10 03:18:01
***************
*** 78,86 ****
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 78,83 ----
***************
*** 89,97 ****
  #endif
  #ifdef HAVE_NETINET6_IN6_H
  #include <netinet6/in6.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #ifdef _AIX
  struct ether_addr;
--- 86,91 ----
Index: heimdal/lib/krb5/log.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/krb5/log.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 log.c
*** heimdal/lib/krb5/log.c	1999/07/24 07:33:58	1.1.1.1
--- heimdal/lib/krb5/log.c	1999/08/10 03:18:02
***************
*** 37,42 ****
--- 37,43 ----
   */
  
  #include "krb5_locl.h"
+ #include <sys/syslog.h>
  
  RCSID("$Id: log.c,v 1.20 1999/04/18 13:48:14 joda Exp $");
  
Index: heimdal/lib/krb5/principal.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/krb5/principal.c,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 principal.c
*** heimdal/lib/krb5/principal.c	1999/07/30 01:19:16	1.1.1.3
--- heimdal/lib/krb5/principal.c	1999/08/10 03:18:06
***************
*** 40,48 ****
  #ifdef HAVE_RES_SEARCH
  #define USE_RESOLVER
  #endif
- #ifdef HAVE_ARPA_NAMESER_H
- #include <arpa/nameser.h>
- #endif
  #include "resolve.h"
  
  RCSID("$Id: principal.c,v 1.48 1999/07/28 03:23:26 assar Exp $");
--- 40,45 ----
Index: heimdal/lib/roken/hstrerror.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/hstrerror.c,v
retrieving revision 1.1.1.2
diff -c -r1.1.1.2 hstrerror.c
*** heimdal/lib/roken/hstrerror.c	1999/07/24 08:25:19	1.1.1.2
--- heimdal/lib/roken/hstrerror.c	1999/08/10 03:18:07
***************
*** 47,60 ****
  
  #include <stdio.h>
  
- #ifdef HAVE_NETDB_H
- #if (defined(SunOS) && (SunOS >= 50))
- #define hstrerror broken_proto
- #endif
- #include <netdb.h>
- #undef hstrerror
- #endif
- 
  #ifndef HAVE_H_ERRNO
  int h_errno = -17; /* Some magic number */
  #endif
--- 47,52 ----
Index: heimdal/lib/roken/inaddr2str.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/inaddr2str.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 inaddr2str.c
*** heimdal/lib/roken/inaddr2str.c	1999/07/24 07:34:00	1.1.1.1
--- heimdal/lib/roken/inaddr2str.c	1999/08/10 03:18:07
***************
*** 46,54 ****
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 46,51 ----
***************
*** 61,69 ****
  
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
- #endif
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
  #endif
  #include "roken.h"
  
--- 58,63 ----
Index: heimdal/lib/roken/inet_aton.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/inet_aton.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 inet_aton.c
*** heimdal/lib/roken/inet_aton.c	1999/07/24 07:34:00	1.1.1.1
--- heimdal/lib/roken/inet_aton.c	1999/08/10 03:18:07
***************
*** 57,65 ****
  #include <netinet6/in6.h>
  #endif
  
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
  #endif
--- 57,62 ----
Index: heimdal/lib/roken/inet_ntop.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/inet_ntop.c,v
retrieving revision 1.2
diff -c -r1.2 inet_ntop.c
*** heimdal/lib/roken/inet_ntop.c	1999/08/05 22:59:51	1.2
--- heimdal/lib/roken/inet_ntop.c	1999/08/10 03:18:07
***************
*** 45,53 ****
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 45,50 ----
Index: heimdal/lib/roken/inet_pton.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/inet_pton.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 inet_pton.c
*** heimdal/lib/roken/inet_pton.c	1999/07/30 01:19:25	1.1.1.1
--- heimdal/lib/roken/inet_pton.c	1999/08/10 03:18:08
***************
*** 45,53 ****
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 45,50 ----
Index: heimdal/lib/roken/iruserok.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/iruserok.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 iruserok.c
*** heimdal/lib/roken/iruserok.c	1999/07/24 07:34:00	1.1.1.1
--- heimdal/lib/roken/iruserok.c	1999/08/10 03:18:09
***************
*** 54,62 ****
  #include <rpcsvc/ypclnt.h>
  #endif
  
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
  #endif
--- 54,59 ----
Index: heimdal/lib/roken/mini_inetd.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/mini_inetd.c,v
retrieving revision 1.1.1.3
diff -c -r1.1.1.3 mini_inetd.c
*** heimdal/lib/roken/mini_inetd.c	1999/08/06 00:12:31	1.1.1.3
--- heimdal/lib/roken/mini_inetd.c	1999/08/10 03:18:10
***************
*** 52,60 ****
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 52,57 ----
Index: heimdal/lib/roken/roken_gethostby.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/roken_gethostby.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 roken_gethostby.c
*** heimdal/lib/roken/roken_gethostby.c	1999/07/24 07:34:01	1.1.1.1
--- heimdal/lib/roken/roken_gethostby.c	1999/08/10 03:18:11
***************
*** 42,50 ****
  #endif
  
  #include <roken.h>
- #ifdef HAVE_NETDB_H
- #include <netdb.h>
- #endif
  #ifdef HAVE_ARPA_INET_H
  #include <arpa/inet.h>
  #endif
--- 42,47 ----
Index: heimdal/lib/roken/socket.c
===================================================================
RCS file: /homes/bam/cvsroot/debian/heimdal/lib/roken/socket.c,v
retrieving revision 1.1.1.1
diff -c -r1.1.1.1 socket.c
*** heimdal/lib/roken/socket.c	1999/08/06 00:12:32	1.1.1.1
--- heimdal/lib/roken/socket.c	1999/08/10 03:18:12
***************
*** 45,53 ****
  #ifdef HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>
- #endif
  #ifdef HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
--- 45,50 ----

PGP signature