[1566] in Kerberos-V5-bugs
krb5b5 patches for ISC (SunSoft) UNIX 4.1
daemon@ATHENA.MIT.EDU (J.J.Bailey)
Sun Jul 23 17:31:04 1995
From: jjb@jagware.bcc.com (J.J.Bailey)
To: krb5-bugs@MIT.EDU
Date: Sun, 23 Jul 1995 14:30:32 -0700 (PDT)
These patches allow one to compile krb5b5 on ISC (SunSoft) UNIX 4.1.
ISC UNIX is SYSV with Berkeley extensions.
-Jack
--
J.J.Bailey
Consultant
jjb@jagware.bcc.com
*** admin/edit/kdb5_edit.h- Wed Jan 25 14:22:04 1995
--- admin/edit/kdb5_edit.h Sun Jul 23 12:34:41 1995
***************
*** 28,33 ****
--- 28,37 ----
extern char *progname;
extern char *Err_no_database;
+ #if defined(ISC_UNIX)
+ #define mblock m_block /* namespace conflict with stream.h */
+ #endif
+
struct mblock {
krb5_deltat max_life;
krb5_deltat max_rlife;
*** appl/bsd/kcmd.c- Tue May 2 19:14:11 1995
--- appl/bsd/kcmd.c Sun Jul 23 12:34:41 1995
***************
*** 54,59 ****
--- 54,63 ----
#include "defines.h"
+ #if defined(ISC_UNIX)
+ #include <net/errno.h>
+ #define SIGURG 100
+ #endif
#define START_PORT 5120 /* arbitrary */
char *default_service = "host";
*** appl/bsd/krcp.c- Fri May 5 06:19:24 1995
--- appl/bsd/krcp.c Sun Jul 23 12:34:41 1995
***************
*** 1085,1090 ****
--- 1085,1095 ----
error("rcp: fstat: %s\n", sys_errlist[errno]);
return (NULLBUF);
}
+
+ #if defined(ISC_UNIX)
+ #define NOROUNDUP
+ #endif
+
#ifdef NOROUNDUP
size = 0;
#else
*** appl/bsd/krlogin.c- Fri Apr 21 12:11:00 1995
--- appl/bsd/krlogin.c Sun Jul 23 12:34:41 1995
***************
*** 100,105 ****
--- 100,112 ----
#endif
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/termio.h>
+ #include <net/errno.h>
+ #include <sys/sioctl.h>
+ #define SIGURG 100
+ #endif
+
/* how do we tell apart irix 5 and irix 4? */
#if defined(__sgi) && defined(__mips)
/* IRIX 5: TIOCGLTC doesn't actually work */
*** appl/bsd/krlogind.c- Wed May 3 00:46:06 1995
--- appl/bsd/krlogind.c Sun Jul 23 12:34:42 1995
***************
*** 215,220 ****
--- 215,230 ----
#undef BUFSIZ
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <net/errno.h>
+ #include <termio.h>
+ #define MAXPATHLEN 1024
+ #endif
+
int auth_sys = 0; /* Which version of Kerberos used to authenticate */
#define KRB5_RECVAUTH_V4 4
***************
*** 903,910 ****
--- 913,922 ----
w.ws_xpixel = ntohs(w.ws_xpixel);
w.ws_ypixel = ntohs(w.ws_ypixel);
(void)ioctl(pty, TIOCSWINSZ, &w);
+ #if !defined(ISC_UNIX)
if (ioctl(pty, TIOCGPGRP, &pgrp) >= 0)
(void) killpg(pgrp, SIGWINCH);
+ #endif
#endif
return (4+sizeof (w));
}
*** appl/bsd/krsh.c- Tue Apr 25 19:51:23 1995
--- appl/bsd/krsh.c Sun Jul 23 12:34:42 1995
***************
*** 54,59 ****
--- 54,67 ----
#include <sys/filio.h>
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <net/errno.h>
+ #endif
+
#ifdef KERBEROS
#include "krb5.h"
#include "com_err.h"
*** appl/bsd/krshd.c- Wed May 3 00:46:08 1995
--- appl/bsd/krshd.c Sun Jul 23 12:34:42 1995
***************
*** 154,159 ****
--- 154,168 ----
#include <sys/filio.h>
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <net/errno.h>
+ #define RPATH ":/usr/ucb:/bin:/usr/bin"
+ #endif
+
#ifdef KERBEROS
#include "krb5.h"
#include "com_err.h"
*** appl/bsd/login.c- Fri Apr 28 17:36:13 1995
--- appl/bsd/login.c Sun Jul 23 12:34:43 1995
***************
*** 118,123 ****
--- 118,133 ----
#include <sys/id.h>
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <sys/termio.h>
+ #define MAXPATHLEN 1024
+ #define LPATH ":/usr/ucb:/bin:/usr/bin"
+ #endif
+
#if defined(_AIX)
#define PRIO_OFFSET 20
#else
*** appl/bsd/setenv.c- Thu Aug 18 14:05:17 1994
--- appl/bsd/setenv.c Sun Jul 23 12:34:43 1995
***************
*** 20,25 ****
--- 20,29 ----
#include <sys/types.h>
#include <stdio.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
/*
* setenv --
* Set the value of the environmental variable "name" to be
*** appl/sample/sclient/sclient.c- Fri Mar 31 19:16:14 1995
--- appl/sample/sclient/sclient.c Sun Jul 23 12:34:43 1995
***************
*** 38,43 ****
--- 38,47 ----
#include <netdb.h>
#include <signal.h>
+ #if defined(ISC_UNIX)
+ #include <net/errno.h>
+ #endif
+
#include "../sample.h"
void
*** appl/telnet/libtelnet/strcasecmp.c- Thu Aug 18 14:07:21 1994
--- appl/telnet/libtelnet/strcasecmp.c Sun Jul 23 12:34:43 1995
***************
*** 35,41 ****
--- 35,43 ----
#define const
#endif
+ #if !defined(ISC_UNIX)
#include <sys/cdefs.h>
+ #endif
#ifdef NO_STRING_H
#include <strings.h>
#else
*** appl/telnet/telnet/authenc.c- Thu Aug 18 14:07:33 1994
--- appl/telnet/telnet/authenc.c Sun Jul 23 12:34:43 1995
***************
*** 33,38 ****
--- 33,42 ----
/* based on @(#)authenc.c 8.1 (Berkeley) 6/6/93 */
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
#if defined(AUTHENTICATION) || defined(ENCRYPTION)
#include <sys/types.h>
#include <arpa/telnet.h>
*** appl/telnet/telnet/commands.c- Mon Nov 7 22:42:49 1994
--- appl/telnet/telnet/commands.c Sun Jul 23 12:34:44 1995
***************
*** 38,43 ****
--- 38,49 ----
#if defined(CRAY) || defined(sysV88)
#include <sys/types.h>
#endif
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #include <net/errno.h>
+ #endif
+
#include <sys/file.h>
#else
#include <sys/types.h>
*** appl/telnet/telnet/main.c- Fri Apr 21 09:47:10 1995
--- appl/telnet/telnet/main.c Sun Jul 23 12:34:44 1995
***************
*** 41,46 ****
--- 41,50 ----
#include <sys/types.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
#include "ring.h"
#include "externs.h"
#include "defines.h"
*** appl/telnet/telnet/network.c- Thu Aug 18 14:07:41 1994
--- appl/telnet/telnet/network.c Sun Jul 23 12:34:44 1995
***************
*** 43,48 ****
--- 43,52 ----
#include <errno.h>
+ #if defined(ISC_UNIX)
+ #include <net/errno.h>
+ #endif
+
#include <arpa/telnet.h>
#include "ring.h"
*** appl/telnet/telnet/sys_bsd.c- Thu Aug 18 14:07:45 1994
--- appl/telnet/telnet/sys_bsd.c Sun Jul 23 12:34:44 1995
***************
*** 50,55 ****
--- 50,66 ----
#include <errno.h>
#include <arpa/telnet.h>
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <net/errno.h>
+ #define USE_TERMIO
+ #undef SYSV_TERMIO
+ #define _XOPEN_SOURCE
+ #endif
+
#include "ring.h"
#include "fdset.h"
*** appl/telnet/telnet/telnet.c- Thu Aug 18 14:07:49 1994
--- appl/telnet/telnet/telnet.c Sun Jul 23 12:34:44 1995
***************
*** 47,52 ****
--- 47,56 ----
#include <ctype.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
#include "ring.h"
#include "defines.h"
*** appl/telnet/telnet/terminal.c- Thu Aug 18 14:07:51 1994
--- appl/telnet/telnet/terminal.c Sun Jul 23 12:34:45 1995
***************
*** 36,41 ****
--- 36,45 ----
#include <arpa/telnet.h>
#include <sys/types.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
#include "ring.h"
#include "externs.h"
*** appl/telnet/telnet/utilities.c- Thu Aug 18 14:07:56 1994
--- appl/telnet/telnet/utilities.c Sun Jul 23 12:34:45 1995
***************
*** 42,47 ****
--- 42,51 ----
#include <ctype.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
#include "general.h"
#include "fdset.h"
*** appl/telnet/telnetd/sys_term.c- Tue Apr 25 20:00:22 1995
--- appl/telnet/telnetd/sys_term.c Sun Jul 23 12:34:45 1995
***************
*** 66,72 ****
--- 66,74 ----
struct utmp wtmp;
# endif /* UTMPX */
+ #if !defined(ISC_UNIX)
int utmp_len = sizeof(wtmp.ut_host);
+ #endif
# ifndef PARENT_DOES_UTMP
char wtmpf[] = "/usr/adm/wtmp";
char utmpf[] = "/etc/utmp";
***************
*** 105,113 ****
--- 107,123 ----
#define SCPYN(a, b) (void) strncpy(a, b, sizeof(a))
#define SCMPN(a, b) strncmp(a, b, sizeof(a))
+ #if defined(ISC_UNIX)
+ #define _XOPEN_SOURCE
+ #include <sys/termio.h>
+ #define L_SET 0
+ #endif
+
#ifdef STREAMS
+ #if !defined(ISC_UNIX) /* already included */
#include <sys/stream.h>
#endif
+ #endif
#ifdef __hpux
#include <sys/resource.h>
#include <sys/proc.h>
***************
*** 1050,1056 ****
--- 1060,1070 ----
# endif
# ifdef TIOCGWINSZ
struct winsize ws;
+ #if defined(ISC_UNIX)
+ int def_row, def_col;
+ #else
extern int def_row, def_col;
+ #endif
# endif
extern int def_tspeed, def_rspeed;
/*
***************
*** 1399,1405 ****
--- 1413,1421 ----
wtmp.ut_type = LOGIN_PROCESS;
wtmp.ut_pid = pid;
SCPYN(wtmp.ut_user, "LOGIN");
+ #if !defined(ISC_UNIX)
SCPYN(wtmp.ut_host, host);
+ #endif
SCPYN(wtmp.ut_line, line + sizeof("/dev/") - 1);
#ifndef __hpux
SCPYN(wtmp.ut_id, wtmp.ut_line+3);
***************
*** 2092,2098 ****
--- 2108,2116 ----
continue;
(void) lseek(f, ((long)u)-((long)utmp), L_SET);
SCPYN(u->ut_name, "");
+ #if !defined(ISC_UNIX)
SCPYN(u->ut_host, "");
+ #endif
(void) time(&u->ut_time);
(void) write(f, (char *)u, sizeof(wtmp));
found++;
***************
*** 2105,2111 ****
--- 2123,2131 ----
if (f >= 0) {
SCPYN(wtmp.ut_line, line+5);
SCPYN(wtmp.ut_name, "");
+ #if !defined(ISC_UNIX)
SCPYN(wtmp.ut_host, "");
+ #endif
(void) time(&wtmp.ut_time);
(void) write(f, (char *)&wtmp, sizeof(wtmp));
(void) close(f);
*** appl/telnet/telnetd/telnetd.c- Wed May 3 16:52:11 1995
--- appl/telnet/telnetd/telnetd.c Sun Jul 23 12:34:46 1995
***************
*** 42,47 ****
--- 42,58 ----
#include "telnetd.h"
#include "pathnames.h"
+ #if defined(ISC_UNIX)
+ #include <sys/tty.h>
+ #include <sys/stream.h>
+ #include <sys/ptem.h>
+ #include <sys/pty.h> /* for FIONBIO */
+ #include <net/errno.h>
+ #define USE_TERMIO
+ #undef SYSV_TERMIO
+ #define _XOPEN_SOURCE
+ #endif
+
#if defined(_SC_CRAY_SECURE_SYS) && !defined(SCM_SECURITY)
/*
* UNICOS 6.0/6.1 do not have SCM_SECURITY defined, so we can
***************
*** 81,87 ****
--- 92,102 ----
int require_SecurID = 0;
#endif
+ #if defined(ISC_UNIX)
+ int utmp_len;
+ #else
extern int utmp_len;
+ #endif
int registerd_host_only = 0;
#ifdef STREAMSPTY
*** appl/telnet/telnetd/utility.c- Thu Aug 18 14:08:21 1994
--- appl/telnet/telnetd/utility.c Sun Jul 23 12:34:46 1995
***************
*** 36,41 ****
--- 36,45 ----
#define PRINTOPTIONS
#include "telnetd.h"
+ #if defined(ISC_UNIX)
+ #include <net/errno.h>
+ #endif
+
/*
* utility functions performing io related tasks
*/
*** include/krb5/k5-config.h- Thu Apr 27 18:18:10 1995
--- include/krb5/k5-config.h Sun Jul 23 12:34:46 1995
***************
*** 186,191 ****
--- 186,206 ----
#include "autoconf.h"
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #include <sys/stream.h>
+ #include <net/errno.h>
+ #ifndef SYSV
+ #define SYSV
+ #endif
+ #ifndef MAXPATHLEN
+ #define MAXPATHLEN 1024
+ #endif
+ #ifndef POSIX_SIGNALS
+ #define POSIX_SIGNALS
+ #endif
+ #endif /* ISC_UNIX */
+
#ifndef KRB5_SYSTYPES__
#define KRB5_SYSTYPES__
*** kadmin.v4/server/kadm_funcs.c- Mon Apr 24 18:24:58 1995
--- kadmin.v4/server/kadm_funcs.c Sun Jul 23 12:34:46 1995
***************
*** 22,27 ****
--- 22,32 ----
/* #include <ndbm.h> Gotten by kadmin_server.h */
#include <ctype.h>
#include <pwd.h>
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#include <sys/file.h>
#include <kadm.h>
#include <kadm_err.h>
*** kadmin/v5server/srv_net.c- Fri Apr 28 14:49:24 1995
--- kadmin/v5server/srv_net.c Sun Jul 23 12:34:46 1995
***************
*** 27,32 ****
--- 27,37 ----
*/
#include <errno.h>
#include <setjmp.h>
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#include <sys/wait.h>
#include <signal.h>
#ifdef USE_PTHREADS
*** lib/crypto/crc32/crc.c- Thu Apr 13 17:49:08 1995
--- lib/crypto/crc32/crc.c Sun Jul 23 12:34:46 1995
***************
*** 27,32 ****
--- 27,36 ----
#include "k5-int.h"
#include "crc-32.h"
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
/* This table and block of comments are taken from code labeled: */
/*
* Copyright (C) 1986 Gary S. Brown. You may use this program, or
*** lib/kdb4/krb_dbm.c- Fri Apr 28 13:36:57 1995
--- lib/kdb4/krb_dbm.c Sun Jul 23 12:34:47 1995
***************
*** 32,37 ****
--- 32,41 ----
#include <fcntl.h>
#endif
+ #if defined(ISC_UNIX)
+ #define utimes(a,b) utime(a,b)
+ #endif
+
#define KERB_DB_MAX_RETRY 5
#ifdef DEBUG
*** lib/krb4/cr_err_repl.c- Thu Apr 27 08:49:05 1995
--- lib/krb4/cr_err_repl.c Sun Jul 23 12:34:47 1995
***************
*** 13,18 ****
--- 13,22 ----
#include "prot.h"
#include <string.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
extern int req_act_vno; /* this is defined in the kerberos
* server code */
*** lib/krb4/kuserok.c- Thu Apr 27 23:02:45 1995
--- lib/krb4/kuserok.c Sun Jul 23 12:34:47 1995
***************
*** 27,32 ****
--- 27,36 ----
#include <sys/unistd.h>
#endif
+ #if defined(ISC_UNIX)
+ #define MAXPATHLEN 1024
+ #endif
+
#ifdef hpux
#define seteuid(e) setresuid(-1,e,-1)
#define setegid(e) setresgid(-1,e,-1)
*** lib/krb4/mk_err.c- Thu Apr 27 08:50:08 1995
--- lib/krb4/mk_err.c Sun Jul 23 12:34:47 1995
***************
*** 13,18 ****
--- 13,22 ----
#include "prot.h"
#include <string.h>
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
/*
* This routine creates a general purpose error reply message. It
* doesn't use KTEXT because application protocol may have long
*** lib/krb4/rd_err.c- Thu Apr 27 08:50:29 1995
--- lib/krb4/rd_err.c Sun Jul 23 12:34:47 1995
***************
*** 17,22 ****
--- 17,26 ----
#include "krb.h"
#include "prot.h"
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
/*
* Given an AUTH_MSG_APPL_ERR message, "in" and its length "in_length",
* return the error code from the message in "code" and the text in
*** lib/krb4/tf_util.c- Fri Apr 28 14:39:20 1995
--- lib/krb4/tf_util.c Sun Jul 23 12:34:47 1995
***************
*** 49,54 ****
--- 49,59 ----
#ifdef __svr4__
#include <utime.h>
#endif
+
+ #if defined(ISC_UNIX)
+ #define utimes(a,b) utime(a,b)
+ #endif
+
int utimes(path, times)
char* path;
struct timeval times[2];
*** lib/krb4/tkt_string.c- Thu Apr 27 08:51:08 1995
--- lib/krb4/tkt_string.c Sun Jul 23 12:34:48 1995
***************
*** 14,19 ****
--- 14,23 ----
#include <string.h>
#include <sys/param.h>
+ #if defined(ISC_UNIX)
+ #define MAXPATHLEN 1024
+ #endif
+
char *getenv();
/*
*** lib/krb5/os/localaddr.c- Thu Mar 30 18:05:39 1995
--- lib/krb5/os/localaddr.c Sun Jul 23 12:34:48 1995
***************
*** 30,35 ****
--- 30,39 ----
#define NEED_SOCKETS
#include "k5-int.h"
+ #if defined(ISC_UNIX)
+ #include <sys/sioctl.h>
+ #endif
+
#if !defined(HAVE_MACSOCK_H) && !defined(_MSDOS)
/* needed for solaris, harmless elsewhere... */
*** lib/krb5/posix/strcasecmp.c- Tue Mar 28 18:49:43 1995
--- lib/krb5/posix/strcasecmp.c Sun Jul 23 12:34:48 1995
***************
*** 38,43 ****
--- 38,47 ----
#include <strings.h>
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/bsdtypes.h>
+ #endif
+
/* based on @(#)strcasecmp.c 5.10 (Berkeley) 1/26/91 */
/*
*** lib/krb5/posix/syslog.c- Thu Apr 13 17:55:52 1995
--- lib/krb5/posix/syslog.c Sun Jul 23 12:34:48 1995
***************
*** 164,170 ****
--- 164,172 ----
int fd;
(void)signal(SIGALRM, SIG_DFL);
+ #if !defined(ISC_UNIX)
sigsetmask((long)~sigmask(SIGALRM));
+ #endif
(void)alarm((u_int)5);
if ((fd = open(CONSOLE, O_WRONLY, 0)) < 0)
return;
*** slave/kprop.c- Mon Mar 27 06:50:27 1995
--- slave/kprop.c Sun Jul 23 12:34:48 1995
***************
*** 27,32 ****
--- 27,37 ----
#include <errno.h>
#include <stdio.h>
#include <ctype.h>
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#include <sys/file.h>
#include <signal.h>
#include <string.h>
*** slave/kpropd.c- Wed May 3 00:49:10 1995
--- slave/kpropd.c Sun Jul 23 12:34:48 1995
***************
*** 32,37 ****
--- 32,42 ----
#include <stdio.h>
#include <ctype.h>
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#include <sys/file.h>
#include <signal.h>
#include <string.h>
*** tests/asn.1/Makefile- Sun Jul 23 12:33:33 1995
--- tests/asn.1/Makefile Sun Jul 23 13:06:16 1995
***************
*** 80,91 ****
ENCOBJS = krb5_encode_test.o ktest.o ktest_equal.o utility.o trval.o
krb5_encode_test: $(ENCOBJS) $(DEPKLIB)
! $(LD) $(CFLAGS) -o krb5_encode_test $(ENCOBJS) $(LIBS) $(KLIB)
DECOBJS = krb5_decode_test.o ktest.o ktest_equal.o utility.o
krb5_decode_test: $(DECOBJS) $(DEPKLIB)
! $(LD) $(CFLAGS) -o krb5_decode_test $(DECOBJS) $(LIBS) $(KLIB)
check:: krb5_decode_test krb5_encode_test
./krb5_decode_test
--- 80,91 ----
ENCOBJS = krb5_encode_test.o ktest.o ktest_equal.o utility.o trval.o
krb5_encode_test: $(ENCOBJS) $(DEPKLIB)
! $(LD) $(CFLAGS) -o krb5_encode_test $(ENCOBJS) $(KLIB) $(LIBS)
DECOBJS = krb5_decode_test.o ktest.o ktest_equal.o utility.o
krb5_decode_test: $(DECOBJS) $(DEPKLIB)
! $(LD) $(CFLAGS) -o krb5_decode_test $(DECOBJS) $(KLIB) $(LIBS)
check:: krb5_decode_test krb5_encode_test
./krb5_decode_test
*** tests/create/kdb5_mkdums.c- Fri Mar 31 14:06:31 1995
--- tests/create/kdb5_mkdums.c Sun Jul 23 12:34:48 1995
***************
*** 33,38 ****
--- 33,42 ----
#define REALM_SEP '@'
#define REALM_SEP_STR "@"
+ #if defined(ISC_UNIX)
+ #define mblock m_block /* namespace conflict with stream.h */
+ #endif
+
struct mblock {
krb5_deltat max_life;
krb5_deltat max_rlife;
*** tests/resolve/resolve.c- Mon May 1 18:27:45 1995
--- tests/resolve/resolve.c Sun Jul 23 12:34:49 1995
***************
*** 53,58 ****
--- 53,62 ----
#include <sys/param.h>
#endif
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#ifdef HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
*** tests/verify/kdb5_verify.c- Tue Feb 28 01:27:16 1995
--- tests/verify/kdb5_verify.c Sun Jul 23 12:34:49 1995
***************
*** 32,37 ****
--- 32,41 ----
#define REALM_SEP '@'
#define REALM_SEP_STR "@"
+ #if defined(ISC_UNIX)
+ #define mblock m_block /* namespace conflict with stream.h */
+ #endif
+
struct mblock {
krb5_deltat max_life;
krb5_deltat max_rlife;
*** util/ss/help.c- Thu Apr 27 09:41:11 1995
--- util/ss/help.c Sun Jul 23 12:34:49 1995
***************
*** 15,20 ****
--- 15,24 ----
#include "ss_internal.h"
#include "copyright.h"
+ #if defined(ISC_UNIX)
+ #define MAXPATHLEN 1024
+ #endif
+
extern int errno;
void ss_help (argc, argv, sci_idx, info_ptr)
*** util/ss/list_rqs.c- Thu Apr 27 09:41:12 1995
--- util/ss/list_rqs.c Sun Jul 23 12:34:49 1995
***************
*** 7,12 ****
--- 7,17 ----
#include "ss_internal.h"
#include <signal.h>
#include <setjmp.h>
+
+ #if defined(ISC_UNIX)
+ #include <sys/types.h>
+ #endif
+
#include <sys/wait.h>
#ifdef lint /* "lint returns a value which is sometimes ignored" */
