[5145] in Kerberos
K5B5 for BSDI 2.0
daemon@ATHENA.MIT.EDU (Brian Kantor)
Thu May 11 13:52:15 1995
Date: Thu, 11 May 1995 10:50:41 -0700
From: Brian Kantor <brian@warlock.ucsd.edu>
To: kerberos@MIT.EDU
The following are the patches I had to make to the K5B5 distribution
in order to get it to compile and pass the regression tests on a
BSDI 2.0 system. They're pretty simple as such things go.
Please understand that I have NOT tested the applications yet;
there will probably have to be more changes to accomodate the
various system peculiarities.
Enjoy.
- Brian
*** src/lib/krb4/dest_tkt.c.orig Tue May 9 12:52:56 1995
--- src/lib/krb4/dest_tkt.c Tue May 9 12:53:54 1995
***************
*** 57,63 ****
)
goto out;
! if ((fd = open(file, O_RDWR|O_SYNC, 0)) < 0)
goto out;
memset(buf, 0, BUFSIZ);
--- 57,63 ----
)
goto out;
! if ((fd = open(file, O_RDWR, 0)) < 0)
goto out;
memset(buf, 0, BUFSIZ);
*** src/lib/krb4/in_tkt.c.orig Tue May 9 12:53:05 1995
--- src/lib/krb4/in_tkt.c Tue May 9 12:53:41 1995
***************
*** 71,77 ****
return(KFAILURE);
}
/* file already exists, and permissions appear ok, so nuke it */
! if ((fd = open(file, O_RDWR|O_SYNC, 0)) < 0)
goto out; /* can't zero it, but we can still try truncating it */
memset(charbuf, 0, sizeof(charbuf));
--- 71,77 ----
return(KFAILURE);
}
/* file already exists, and permissions appear ok, so nuke it */
! if ((fd = open(file, O_RDWR, 0)) < 0)
goto out; /* can't zero it, but we can still try truncating it */
memset(charbuf, 0, sizeof(charbuf));
*** src/lib/krb5/ccache/file/fcc_close.c.orig Tue Mar 7 17:03:22 1995
--- src/lib/krb5/ccache/file/fcc_close.c Tue May 9 11:51:56 1995
***************
*** 27,33 ****
#include "fcc.h"
- #include <malloc.h>
/*
* Modifies:
* id
--- 27,32 ----
*** src/appl/bsd/krcp.c.orig Tue May 9 13:04:19 1995
--- src/appl/bsd/krcp.c Tue May 9 13:04:41 1995
***************
*** 107,113 ****
int errs;
krb5_sigtype lostconn();
int errno;
- extern char *sys_errlist[];
int iamremote, targetshouldbedirectory;
int iamrecursive;
int pflag;
--- 107,112 ----
*** src/appl/bsd/krlogin.c.orig Tue May 9 13:06:32 1995
--- src/appl/bsd/krlogin.c Tue May 9 13:11:38 1995
***************
*** 1485,1496 ****
/* newtty.c_iflag |= (BRKINT|ISTRIP|IXON|IXANY); */
newtty.c_iflag &= ~(IXON|IXANY);
newtty.c_iflag |= (BRKINT|ISTRIP);
! newtty.c_oflag &= ~(ONLCR|ONOCR);
newtty.c_oflag |= (OPOST);
}
/* preserve tab delays, but turn off XTABS */
! if ((newtty.c_oflag & TABDLY) == TAB3)
! newtty.c_oflag &= ~TABDLY;
if (litout)
newtty.c_oflag &= ~OPOST;
--- 1485,1495 ----
/* newtty.c_iflag |= (BRKINT|ISTRIP|IXON|IXANY); */
newtty.c_iflag &= ~(IXON|IXANY);
newtty.c_iflag |= (BRKINT|ISTRIP);
! newtty.c_oflag &= ~(ONLCR);
newtty.c_oflag |= (OPOST);
}
/* preserve tab delays, but turn off XTABS */
! newtty.c_oflag &= ~OXTABS;
if (litout)
newtty.c_oflag &= ~OPOST;
*** src/appl/bsd/loginpaths.h.orig Tue May 9 13:15:14 1995
--- src/appl/bsd/loginpaths.h Tue May 9 13:16:43 1995
***************
*** 74,79 ****
--- 74,84 ----
#endif
#endif
+ #ifdef __bsdi__
+ #define LPATH "/usr/bin:/bin"
+ #define RPATH "/usr/bin:/bin"
+ #endif
+
#ifndef LPATH
#ifdef __svr4__
/* taken from unixware, sirius... */
*** src/appl/bsd/login.c.orig Tue May 9 13:18:38 1995
--- src/appl/bsd/login.c Tue May 9 13:19:15 1995
***************
*** 1329,1335 ****
tp->c_lflag |= ECHOKE;
#endif
tp->c_iflag |= ICRNL|BRKINT;
! tp->c_oflag |= ONLCR|OPOST|TAB3;
#else /* !POSIX_TERMIOS */
tp->sg_flags = ECHO|CRMOD|ANYP|XTABS;
#endif
--- 1329,1335 ----
tp->c_lflag |= ECHOKE;
#endif
tp->c_iflag |= ICRNL|BRKINT;
! tp->c_oflag |= ONLCR|OPOST|OXTABS;
#else /* !POSIX_TERMIOS */
tp->sg_flags = ECHO|CRMOD|ANYP|XTABS;
#endif
*** src/include/krb5/stock/osconf.h.orig Thu May 11 10:42:39 1995
--- src/include/krb5/stock/osconf.h Thu May 11 10:42:57 1995
***************
*** 80,86 ****
#define SKDC_TIMEOUT_SHIFT 2 /* left shift of timeout for backoff */
#define SKDC_TIMEOUT_1 1 /* seconds for first timeout */
! #define RCTMPDIR "/usr/tmp" /* directory to store replay caches */
#define KRB5_PATH_TTY "/dev/tty"
#define KRB5_PATH_LOGIN "@KRB5ROOT/sbin/login.krb5"
--- 80,86 ----
#define SKDC_TIMEOUT_SHIFT 2 /* left shift of timeout for backoff */
#define SKDC_TIMEOUT_1 1 /* seconds for first timeout */
! #define RCTMPDIR "/var/tmp" /* directory to store replay caches */
#define KRB5_PATH_TTY "/dev/tty"
#define KRB5_PATH_LOGIN "@KRB5ROOT/sbin/login.krb5"
