[2879] in Kerberos-V5-bugs
krb5-build/550: Improve source portability to POSIX.1 platforms
daemon@ATHENA.MIT.EDU (oconnor_brian@tandem.com)
Tue Feb 17 15:53:26 1998
Resent-From: gnats@rt-11.MIT.EDU (GNATS Management)
Resent-To: tlyu@MIT.EDU
Resent-Reply-To: krb5-bugs@MIT.EDU, oconnor_brian@tandem.com
Date: Tue, 17 Feb 1998 12:49:00 -0800
From: oconnor_brian@tandem.com
Reply-To: oconnor_brian@tandem.com
To: krb5-bugs@MIT.EDU
>Number: 550
>Category: krb5-build
>Synopsis: Improve source portability to POSIX.1 platforms.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: tlyu
>State: open
>Class: change-request
>Submitter-Id: unknown
>Arrival-Date: Tue Feb 17 15:53:01 EST 1998
>Last-Modified:
>Originator: oconnor_brian@tandem.com
>Organization:
>Release: krb5-1.0.4
>Environment:
System: NonStop Kernel Open System Services
Architecture: mips-tandem
>Description:
Improve source code portability for POSIX.1-compliant systems
by conditionally including header files that may not exist
on POSIX.1-compliant platforms.
>How-To-Repeat:
Try compiling Kerberos V5 source code on a POSIX.1-compliant
system that lacks UNIX-specific header files.
>Fix:
diff -rc krb5-1.0.4/src/kadmin/v4server/ChangeLog patch1/kadmin/v4server/ChangeLog
*** krb5-1.0.4/src/kadmin/v4server/ChangeLog Thu Dec 4 19:43:36 1997
--- patch1/kadmin/v4server/ChangeLog Tue Feb 17 12:04:43 1998
***************
*** 1,3 ****
--- 1,14 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * acl_files.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/file.h>, <sys/errno.h>,
+ and <errno.h>. POSIX.1-compliant systems will provide an
+ <errno.h> header file, but may not provide <sys/errno.h>
+ or <sys/file.h> header files.
+ * configure.in: Added header file checks for <sys/errno.h>,
+ <errno.h>, and <sys/file.h>.
+ * kadm_funcs.c: Conditionally include <sys/file.h>.
+
Fri Nov 22 15:49:27 1996 unknown <bjaspan@mit.edu>
* kadm_ser_wrap.c (endif ): use sizeof instead of h_length to
diff -rc krb5-1.0.4/src/kadmin/v4server/acl_files.c patch1/kadmin/v4server/acl_files.c
*** krb5-1.0.4/src/kadmin/v4server/acl_files.c Thu Dec 4 19:43:37 1997
--- patch1/kadmin/v4server/acl_files.c Mon Feb 16 16:36:59 1998
***************
*** 17,25 ****
--- 17,35 ----
#include <unistd.h>
#endif
#include <sys/types.h>
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <sys/stat.h>
+
+ #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+ #else
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+ #endif
+
#include <ctype.h>
#include <fcntl.h>
#include "krb.h"
diff -rc krb5-1.0.4/src/kadmin/v4server/configure.in patch1/kadmin/v4server/configure.in
*** krb5-1.0.4/src/kadmin/v4server/configure.in Thu Dec 4 19:43:37 1997
--- patch1/kadmin/v4server/configure.in Mon Feb 16 16:44:45 1998
***************
*** 3,8 ****
--- 3,9 ----
AC_CONFIG_SUBDIRS(unit-test)
AC_PROG_INSTALL
AC_CHECK_HEADERS(sys/time.h unistd.h stdlib.h)
+ AC_CHECK_HEADERS(sys/errno.h errno.h sys/file.h)
CHECK_SIGNALS
CHECK_WAIT_TYPE
AC_PROG_AWK
diff -rc krb5-1.0.4/src/kadmin/v4server/kadm_funcs.c patch1/kadmin/v4server/kadm_funcs.c
*** krb5-1.0.4/src/kadmin/v4server/kadm_funcs.c Thu Dec 4 19:43:37 1997
--- patch1/kadmin/v4server/kadm_funcs.c Mon Feb 16 16:37:18 1998
***************
*** 22,28 ****
--- 22,32 ----
/* #include <ndbm.h> Gotten by kadmin_server.h */
#include <ctype.h>
#include <pwd.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <kadm.h>
#include <kadm_err.h>
#include <krb_db.h>
diff -rc krb5-1.0.4/src/kdc/ChangeLog patch1/kdc/ChangeLog
*** krb5-1.0.4/src/kdc/ChangeLog Thu Dec 4 19:43:53 1997
--- patch1/kdc/ChangeLog Tue Feb 17 12:03:25 1998
***************
*** 1,3 ****
--- 1,9 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * kerberos_v4.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/file.h>. POSIX.1-compliant
+ systems are not required to provide a <sys/file.h> header file.
+
Mon Nov 24 19:57:48 1997 Theodore Y. Ts'o <tytso@mit.edu>
* do_tgs_req.c (process_tgs_req): Add check to make sure cname and
diff -rc krb5-1.0.4/src/kdc/kerberos_v4.c patch1/kdc/kerberos_v4.c
*** krb5-1.0.4/src/kdc/kerberos_v4.c Thu Dec 4 19:43:54 1997
--- patch1/kdc/kerberos_v4.c Mon Feb 16 16:37:36 1998
***************
*** 55,61 ****
--- 55,65 ----
#else
#include <time.h>
#endif
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <ctype.h>
#include <syslog.h>
#include <string.h>
diff -rc krb5-1.0.4/src/krb524/ChangeLog patch1/krb524/ChangeLog
*** krb5-1.0.4/src/krb524/ChangeLog Thu Dec 4 19:43:56 1997
--- patch1/krb524/ChangeLog Tue Feb 17 11:13:27 1998
***************
*** 1,3 ****
--- 1,16 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * configure.in: Added header file checks for <sys/signal.h>
+ and <signal.h>.
+ * conv_princ.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/signal.h> and <signal.h>.
+ POSIX.1-compliant systems will provide a <signal.h> header
+ file, but may lack a <sys/signal.h> header file.
+ * encode.c: Conditionally include <sys/signal.h>.
+ * k524init.c: Conditionally include <sys/signal.h>.
+ * krb524d.c: Conditionally include <sys/signal.h>.
+ * misc.c: Conditionally include <sys/signal.h> and <signal.h>.
+
Thu Dec 5 23:27:00 1996 Tom Yu <tlyu@mit.edu>
* krb524d.c (main): Ignore SIGHUP for now. [27]
diff -rc krb5-1.0.4/src/krb524/configure.in patch1/krb524/configure.in
*** krb5-1.0.4/src/krb524/configure.in Thu Dec 4 19:43:57 1997
--- patch1/krb524/configure.in Mon Feb 16 17:10:29 1998
***************
*** 15,19 ****
USE_KRB4_LIBRARY
KRB5_LIBRARIES
V5_USE_SHARED_LIB
! AC_CHECK_HEADERS(sys/select.h) dnl
V5_AC_OUTPUT_MAKEFILE
--- 15,19 ----
USE_KRB4_LIBRARY
KRB5_LIBRARIES
V5_USE_SHARED_LIB
! AC_CHECK_HEADERS(sys/select.h sys/signal.h signal.h) dnl
V5_AC_OUTPUT_MAKEFILE
diff -rc krb5-1.0.4/src/krb524/conv_princ.c patch1/krb524/conv_princ.c
*** krb5-1.0.4/src/krb524/conv_princ.c Thu Dec 4 19:43:57 1997
--- patch1/krb524/conv_princ.c Mon Feb 16 17:09:42 1998
***************
*** 25,31 ****
--- 25,39 ----
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
+ #else
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
+ #endif
+
#include <netinet/in.h>
#include <krb.h>
diff -rc krb5-1.0.4/src/krb524/encode.c patch1/krb524/encode.c
*** krb5-1.0.4/src/krb524/encode.c Thu Dec 4 19:43:57 1997
--- patch1/krb524/encode.c Mon Feb 16 17:09:50 1998
***************
*** 27,33 ****
--- 27,37 ----
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
+ #endif
+
#include <netinet/in.h>
#include <krb.h>
diff -rc krb5-1.0.4/src/krb524/k524init.c patch1/krb524/k524init.c
*** krb5-1.0.4/src/krb524/k524init.c Thu Dec 4 19:43:57 1997
--- patch1/krb524/k524init.c Mon Feb 16 17:09:59 1998
***************
*** 29,35 ****
--- 29,39 ----
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
+ #endif
+
#include <netinet/in.h>
#include <krb.h>
diff -rc krb5-1.0.4/src/krb524/krb524d.c patch1/krb524/krb524d.c
*** krb5-1.0.4/src/krb524/krb524d.c Thu Dec 4 19:43:58 1997
--- patch1/krb524/krb524d.c Mon Feb 16 17:10:11 1998
***************
*** 33,39 ****
--- 33,43 ----
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
+ #endif
+
#include <netinet/in.h>
#include <netdb.h>
diff -rc krb5-1.0.4/src/krb524/misc.c patch1/krb524/misc.c
*** krb5-1.0.4/src/krb524/misc.c Thu Dec 4 19:43:58 1997
--- patch1/krb524/misc.c Mon Feb 16 17:10:18 1998
***************
*** 25,31 ****
--- 25,39 ----
#include <sys/types.h>
#include <sys/time.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
+ #else
+ #ifdef HAVE_SIGNAL_H
+ #include <signal.h>
+ #endif
+ #endif
+
#include <netinet/in.h>
#include <krb.h>
diff -rc krb5-1.0.4/src/lib/kadm5/srv/ChangeLog patch1/lib/kadm5/srv/ChangeLog
*** krb5-1.0.4/src/lib/kadm5/srv/ChangeLog Thu Dec 4 19:44:43 1997
--- patch1/lib/kadm5/srv/ChangeLog Tue Feb 17 11:23:31 1998
***************
*** 1,3 ****
--- 1,11 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * adb_openclose.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/file.h>. POSIX.1-compliant
+ systems are not required to provide a <sys/file.h> header file.
+ * adb_policy.c: Conditionally include <sys/file.h>.
+ * configure.in: Added header check for <sys/file.h>.
+
Sun Mar 9 13:40:33 1997 Tom Yu <tlyu@mit.edu>
* svr_principal.c (add_to_history): Don't call realloc() on a NULL
diff -rc krb5-1.0.4/src/lib/kadm5/srv/adb_openclose.c patch1/lib/kadm5/srv/adb_openclose.c
*** krb5-1.0.4/src/lib/kadm5/srv/adb_openclose.c Thu Dec 4 19:44:44 1997
--- patch1/lib/kadm5/srv/adb_openclose.c Tue Feb 17 10:37:20 1998
***************
*** 8,14 ****
--- 8,17 ----
static char *rcsid = "$Header: /cvs/krbdev/krb5/src/lib/kadm5/srv/adb_openclose.c,v 1.3 1996/10/18 18:25:04 bjaspan Exp $";
#endif
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <fcntl.h>
#include <unistd.h>
#include "adb.h"
diff -rc krb5-1.0.4/src/lib/kadm5/srv/adb_policy.c patch1/lib/kadm5/srv/adb_policy.c
*** krb5-1.0.4/src/lib/kadm5/srv/adb_policy.c Thu Dec 4 19:44:44 1997
--- patch1/lib/kadm5/srv/adb_policy.c Tue Feb 17 12:15:37 1998
***************
*** 8,14 ****
--- 8,17 ----
static char *rcsid = "$Header: /cvs/krbdev/krb5/src/lib/kadm5/srv/adb_policy.c,v 1.4 1996/10/18 19:45:50 bjaspan Exp $";
#endif
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <fcntl.h>
#include "adb.h"
#include <stdlib.h>
diff -rc krb5-1.0.4/src/lib/kadm5/srv/configure.in patch1/lib/kadm5/srv/configure.in
*** krb5-1.0.4/src/lib/kadm5/srv/configure.in Thu Dec 4 19:44:44 1997
--- patch1/lib/kadm5/srv/configure.in Mon Feb 16 17:04:45 1998
***************
*** 6,11 ****
--- 6,12 ----
AC_PROG_INSTALL
AC_PROG_LEX
AC_PROG_AWK
+ AC_CHECK_HEADERS(sys/file.h)
save_LIBS="$LIBS"
LIBS=-lgen
diff -rc krb5-1.0.4/src/lib/kadm5/unit-test/ChangeLog patch1/lib/kadm5/unit-test/ChangeLog
*** krb5-1.0.4/src/lib/kadm5/unit-test/ChangeLog Thu Dec 4 19:44:47 1997
--- patch1/lib/kadm5/unit-test/ChangeLog Tue Feb 17 11:25:59 1998
***************
*** 1,3 ****
--- 1,11 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * configure.in: Added header check for <sys/file.h>.
+ * destroy-test.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/file.h>. POSIX.1-compliant
+ systems are not required to provide a <sys/file.h> header file.
+ * handle-test.c: Conditionally include <sys/file.h>.
+
Wed Nov 20 15:59:34 1996 Barry Jaspan <bjaspan@mit.edu>
* Makefile.in (check-): warn more loudly about unrun tests
diff -rc krb5-1.0.4/src/lib/kadm5/unit-test/destroy-test.c patch1/lib/kadm5/unit-test/destroy-test.c
*** krb5-1.0.4/src/lib/kadm5/unit-test/destroy-test.c Thu Dec 4 19:44:47 1997
--- patch1/lib/kadm5/unit-test/destroy-test.c Mon Feb 16 16:39:20 1998
***************
*** 3,9 ****
--- 3,13 ----
#include <stdio.h>
#include <krb5.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <unistd.h>
#include <netinet/in.h>
#include <kadm5/client_internal.h>
diff -rc krb5-1.0.4/src/lib/kadm5/unit-test/handle-test.c patch1/lib/kadm5/unit-test/handle-test.c
*** krb5-1.0.4/src/lib/kadm5/unit-test/handle-test.c Thu Dec 4 19:44:47 1997
--- patch1/lib/kadm5/unit-test/handle-test.c Mon Feb 16 16:39:29 1998
***************
*** 3,9 ****
--- 3,13 ----
#include <stdio.h>
#include <krb5.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <unistd.h>
#include <netinet/in.h>
#include <kadm5/client_internal.h>
diff -rc krb5-1.0.4/src/lib/krb4/ChangeLog patch1/lib/krb4/ChangeLog
*** krb5-1.0.4/src/lib/krb4/ChangeLog Thu Dec 4 19:45:01 1997
--- patch1/lib/krb4/ChangeLog Tue Feb 17 11:29:15 1998
***************
*** 1,3 ****
--- 1,14 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * configure.in: Added header check for <sys/file.h>.
+ * dest_tkt.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/file.h>. POSIX.1-compliant
+ systems are not required to provide a <sys/file.h> header file.
+ * in_tkt.c: Conditionally include <sys/file.h>.
+ * kuserok.c: Conditionally include <sys/file.h>.
+ * put_svc_key.c: Conditionally include <sys/file.h>.
+ * tf_util.c: Conditionally include <sys/file.h>.
+
Wed Apr 9 23:15:39 1997 Tom Yu <tlyu@mit.edu>
* realmofhost.c (krb_realmofhost): Add bounds checking to various
diff -rc krb5-1.0.4/src/lib/krb4/configure.in patch1/lib/krb4/configure.in
*** krb5-1.0.4/src/lib/krb4/configure.in Thu Dec 4 19:45:01 1997
--- patch1/lib/krb4/configure.in Mon Feb 16 16:41:59 1998
***************
*** 7,13 ****
AC_CONST
KRB5_POSIX_LOCKS
AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
! AC_CHECK_HEADERS(sys/select.h time.h)
dnl Could check for full stdc environment, but will only test
dnl for stdlib.h
AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H))
--- 7,13 ----
AC_CONST
KRB5_POSIX_LOCKS
AC_HEADER_CHECK(unistd.h,AC_DEFINE(HAS_UNISTD_H))
! AC_CHECK_HEADERS(sys/select.h time.h sys/file.h)
dnl Could check for full stdc environment, but will only test
dnl for stdlib.h
AC_HEADER_CHECK(stdlib.h,AC_DEFINE(HAS_STDLIB_H))
diff -rc krb5-1.0.4/src/lib/krb4/dest_tkt.c patch1/lib/krb4/dest_tkt.c
*** krb5-1.0.4/src/lib/krb4/dest_tkt.c Thu Dec 4 19:45:02 1997
--- patch1/lib/krb4/dest_tkt.c Mon Feb 16 16:39:53 1998
***************
*** 11,17 ****
--- 11,19 ----
#include "mit-copyright.h"
#include "krb.h"
#include <stdio.h>
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <sys/stat.h>
#ifdef TKT_SHMEM
#include <sys/param.h>
diff -rc krb5-1.0.4/src/lib/krb4/in_tkt.c patch1/lib/krb4/in_tkt.c
*** krb5-1.0.4/src/lib/krb4/in_tkt.c Thu Dec 4 19:45:04 1997
--- patch1/lib/krb4/in_tkt.c Mon Feb 16 16:40:03 1998
***************
*** 12,18 ****
--- 12,20 ----
#include <stdio.h>
#include <string.h>
#include "krb.h"
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <fcntl.h>
#include <sys/stat.h>
#ifdef TKT_SHMEM
diff -rc krb5-1.0.4/src/lib/krb4/kuserok.c patch1/lib/krb4/kuserok.c
*** krb5-1.0.4/src/lib/krb4/kuserok.c Thu Dec 4 19:45:04 1997
--- patch1/lib/krb4/kuserok.c Mon Feb 16 16:40:13 1998
***************
*** 17,23 ****
--- 17,25 ----
#include <pwd.h>
#include <sys/param.h>
#include <sys/stat.h>
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <string.h>
#ifdef HAS_UNISTD_H
#include <unistd.h>
diff -rc krb5-1.0.4/src/lib/krb4/put_svc_key.c patch1/lib/krb4/put_svc_key.c
*** krb5-1.0.4/src/lib/krb4/put_svc_key.c Thu Dec 4 19:45:07 1997
--- patch1/lib/krb4/put_svc_key.c Mon Feb 16 16:40:27 1998
***************
*** 24,30 ****
--- 24,34 ----
#include "krb.h"
#include <string.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <stdio.h>
#include <fcntl.h>
#ifdef HAS_UNISTD_H
diff -rc krb5-1.0.4/src/lib/krb4/tf_util.c patch1/lib/krb4/tf_util.c
*** krb5-1.0.4/src/lib/krb4/tf_util.c Thu Dec 4 19:45:09 1997
--- patch1/lib/krb4/tf_util.c Mon Feb 16 16:40:46 1998
***************
*** 15,21 ****
--- 15,23 ----
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <fcntl.h>
#ifdef TKT_SHMEM
diff -rc krb5-1.0.4/src/lib/rpc/ChangeLog patch1/lib/rpc/ChangeLog
*** krb5-1.0.4/src/lib/rpc/ChangeLog Thu Dec 4 19:45:58 1997
--- patch1/lib/rpc/ChangeLog Tue Feb 17 12:12:48 1998
***************
*** 1,3 ****
--- 1,22 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * bindresvport.c: Improve portability to non-UNIX platforms
+ by conditionally including <sys/errno.h> and <errno.h>.
+ POSIX.1-compliant systems will provide an <errno.h> header file,
+ but are not required to provide a <sys/errno.h> header file.
+ * clnt_generic.c: Conditionally include <sys/errno.h>
+ and <errno.h>.
+ * configure.in: Added header checks for <sys/file.h>,
+ <sys/errno.h>, <errno.h>, and <sys/time.h>. Also added
+ the AC_HEADER_TIME macro. POSIX.1-compliant systems will
+ provide a <time.h> header file, but are not required to
+ provide a <sys/time.h> header file.
+ * svc.c: Conditionally include <sys/errno.h>, <errno.h>,
+ <sys/time.h>, and <time.h>.
+ * svc_auth_gssapi.c: Conditionally include <sys/file.h>.
+ * svc_run.c: Conditionally include <sys/time.h>, <time.h>,
+ <sys/errno.h>, and <errno.h>.
+
Tue Oct 21 14:31:33 1997 Ezra Peisach <epeisach@mit.edu>
* svc_auth_gssapi.c (destroy_client): Fix to not lose entries in
diff -rc krb5-1.0.4/src/lib/rpc/bindresvport.c patch1/lib/rpc/bindresvport.c
*** krb5-1.0.4/src/lib/rpc/bindresvport.c Thu Dec 4 19:45:59 1997
--- patch1/lib/rpc/bindresvport.c Mon Feb 16 17:07:59 1998
***************
*** 33,39 ****
--- 33,47 ----
*/
#include <sys/types.h>
+
+ #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+ #else
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+ #endif
+
#include <sys/socket.h>
#include <netinet/in.h>
diff -rc krb5-1.0.4/src/lib/rpc/clnt_generic.c patch1/lib/rpc/clnt_generic.c
*** krb5-1.0.4/src/lib/rpc/clnt_generic.c Thu Dec 4 19:45:59 1997
--- patch1/lib/rpc/clnt_generic.c Mon Feb 16 17:08:10 1998
***************
*** 35,41 ****
--- 35,49 ----
*/
#include <rpc/rpc.h>
#include <sys/socket.h>
+
+ #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+ #else
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+ #endif
+
#include <netdb.h>
/*
diff -rc krb5-1.0.4/src/lib/rpc/configure.in patch1/lib/rpc/configure.in
*** krb5-1.0.4/src/lib/rpc/configure.in Thu Dec 4 19:46:00 1997
--- patch1/lib/rpc/configure.in Tue Feb 17 10:34:18 1998
***************
*** 11,16 ****
--- 11,19 ----
STDLIB_INCLUDE="#include <stdlib.h>"],
[STDLIB_INCLUDE=""])
AC_SUBST(STDLIB_INCLUDE) dnl
+ AC_CHECK_HEADERS(sys/errno.h errno.h sys/time.h)
+ AC_CHECK_HEADERS(sys/file.h)
+ AC_HEADER_TIME
### Check where struct rpcent is declared.
#
# This is necessary to determine:
diff -rc krb5-1.0.4/src/lib/rpc/svc.c patch1/lib/rpc/svc.c
*** krb5-1.0.4/src/lib/rpc/svc.c Thu Dec 4 19:46:02 1997
--- patch1/lib/rpc/svc.c Tue Feb 17 10:33:50 1998
***************
*** 41,47 ****
--- 41,65 ----
* Copyright (C) 1984, Sun Microsystems, Inc.
*/
+ #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+ #else
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+ #endif
+
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+ # ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ # else
+ # include <time.h>
+ # endif
+ #endif
+
#include <rpc/rpc.h>
#include <rpc/pmap_clnt.h>
#include <stdio.h>
diff -rc krb5-1.0.4/src/lib/rpc/svc_auth_gssapi.c patch1/lib/rpc/svc_auth_gssapi.c
*** krb5-1.0.4/src/lib/rpc/svc_auth_gssapi.c Thu Dec 4 19:46:02 1997
--- patch1/lib/rpc/svc_auth_gssapi.c Tue Feb 17 11:42:39 1998
***************
*** 243,249 ****
--- 243,251 ----
#include <krb5.h>
#endif
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
#include <fcntl.h>
#define INITIATION_TIMEOUT 60*15 /* seconds until partially created */
diff -rc krb5-1.0.4/src/lib/rpc/svc_run.c patch1/lib/rpc/svc_run.c
*** krb5-1.0.4/src/lib/rpc/svc_run.c Thu Dec 4 19:46:02 1997
--- patch1/lib/rpc/svc_run.c Mon Feb 16 17:08:29 1998
***************
*** 36,43 ****
--- 36,62 ----
* This is the rpc server side idle loop
* Wait for input, call server program.
*/
+
+ #ifdef TIME_WITH_SYS_TIME
+ # include <sys/time.h>
+ # include <time.h>
+ #else
+ # ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
+ # else
+ # include <time.h>
+ # endif
+ #endif
+
#include <rpc/rpc.h>
+
+ #ifdef HAVE_SYS_ERRNO_H
#include <sys/errno.h>
+ #else
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+ #endif
void
svc_run()
diff -rc krb5-1.0.4/src/util/ss/ChangeLog patch1/util/ss/ChangeLog
*** krb5-1.0.4/src/util/ss/ChangeLog Thu Dec 4 19:47:41 1997
--- patch1/util/ss/ChangeLog Tue Feb 17 11:46:57 1998
***************
*** 1,3 ****
--- 1,10 ----
+ Tue Feb 17 16:00:00 1998 Brian O'Connor <oconnor_brian@tandem.com>
+
+ * help.c: Improve portability to non-UNIX platforms by
+ conditionally including <sys/file.h>. POSIX.1-compliant
+ systems are not required to provide a <sys/file.h> header file.
+ * pager.c: Conditionally include <sys/file.h>.
+
Thu Jun 13 21:43:44 1996 Tom Yu <tlyu@voltage-multiplier.mit.edu>
* configure.in: remove ref to SS_RULES, ET_RULES
diff -rc krb5-1.0.4/src/util/ss/help.c patch1/util/ss/help.c
*** krb5-1.0.4/src/util/ss/help.c Thu Dec 4 19:47:42 1997
--- patch1/util/ss/help.c Tue Feb 17 10:35:41 1998
***************
*** 6,12 ****
--- 6,16 ----
#include <sys/param.h>
#include <sys/types.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <fcntl.h> /* just for O_* */
#include <sys/wait.h>
#include "ss_internal.h"
diff -rc krb5-1.0.4/src/util/ss/pager.c patch1/util/ss/pager.c
*** krb5-1.0.4/src/util/ss/pager.c Thu Dec 4 19:47:43 1997
--- patch1/util/ss/pager.c Mon Feb 16 16:41:27 1998
***************
*** 11,17 ****
--- 11,21 ----
#include "copyright.h"
#include <stdio.h>
#include <sys/types.h>
+
+ #ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
+ #endif
+
#include <signal.h>
static char MORE[] = "more";
>Audit-Trail:
>Unformatted:
