[5444] in Athena Bugs
patches for kerberos for A/UX
daemon@ATHENA.MIT.EDU (Mark D. Virtue)
Sat Jul 7 18:08:18 1990
Date: Sat, 7 Jul 90 15:05:47 PDT
From: Mark D. Virtue <vrt@horton.mit.edu>
To: bug-kerberos@ATHENA.MIT.EDU, mit@ATHENA.MIT.EDU.edu,
1) this does not include patches for the imake that comes with kerberos
I grabbed the X11 Imake since it solves the problem of certain CPP's
inability to create tabs.
2) I do not have patches for rlogin, rlogind, login, logind, or erlogin stuff
3) the CPP predefined symbol for A/UX is _AUX_SOURCE
--vrt
diff -rc /source/athena/athena.lib/kerberos/admin/kdb_edit.c kerberos/admin/kdb_edit.c
*** /source/athena/athena.lib/kerberos/admin/kdb_edit.c Tue Apr 24 16:38:07 1990
--- kerberos/admin/kdb_edit.c Wed Jun 6 00:59:19 1990
***************
*** 28,33
#include <errno.h>
#include <strings.h>
#include <sys/ioctl.h>
#include <sys/file.h>
#include "time.h"
#include <des.h>
--- 28,36 -----
#include <errno.h>
#include <strings.h>
#include <sys/ioctl.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include "time.h"
#include <des.h>
Only in kerberos/admin: kdb_edit.o
Only in kerberos/admin: kdb_init
Only in kerberos/admin: kdb_init.o
Only in kerberos/admin: kdb_util
Only in kerberos/admin: kdb_util.o
Only in kerberos/admin: kstash
Only in kerberos/admin: kstash.o
diff -rc /source/athena/athena.lib/kerberos/admin/maketime.c kerberos/admin/maketime.c
*** /source/athena/athena.lib/kerberos/admin/maketime.c Tue Apr 24 16:38:17 1990
--- kerberos/admin/maketime.c Wed Jun 6 01:02:22 1990
***************
*** 17,23
#include <mit-copyright.h>
#include <sys/time.h>
!
#define daysinyear(y) (((y) % 4) ? 365 : (((y) % 100) ? 366 : (((y) % 400) ? 365 : 366)))
#define SECSPERDAY 24*60*60
--- 17,25 -----
#include <mit-copyright.h>
#include <sys/time.h>
! #ifdef macII
! #include <time.h>
! #endif
#define daysinyear(y) (((y) % 4) ? 365 : (((y) % 100) ? 366 : (((y) % 400) ? 365 : 366)))
#define SECSPERDAY 24*60*60
Only in kerberos/admin: maketime.o
diff -rc /source/athena/athena.lib/kerberos/appl/bsd/kcmd.c kerberos/appl/bsd/kcmd.c
*** /source/athena/athena.lib/kerberos/appl/bsd/kcmd.c Tue Apr 24 16:38:26 1990
--- kerberos/appl/bsd/kcmd.c Wed Jun 6 01:13:57 1990
***************
*** 31,36
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
#include <ctype.h>
#include <pwd.h>
#include <sys/param.h>
--- 31,39 -----
#endif /* LIBC_SCCS and not lint */
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <ctype.h>
#include <pwd.h>
#include <sys/param.h>
Only in kerberos/appl/bsd: kcmd.o
Only in kerberos/appl/bsd: kshd
diff -rc /source/athena/athena.lib/kerberos/appl/bsd/rcp.c kerberos/appl/bsd/rcp.c
*** /source/athena/athena.lib/kerberos/appl/bsd/rcp.c Thu Jul 6 11:12:15 1989
--- kerberos/appl/bsd/rcp.c Wed Jun 6 01:29:27 1990
***************
*** 37,42
/*
* rcp
*/
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
--- 37,45 -----
/*
* rcp
*/
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
***************
*** 524,529
#else
register int (*istat)(), (*qstat)();
#endif
if ((pid = vfork()) == 0) {
(void) setuid(userid);
--- 527,535 -----
#else
register int (*istat)(), (*qstat)();
#endif
+ #ifdef macII
+ #define vfork fork
+ #endif
if ((pid = vfork()) == 0) {
(void) setuid(userid);
***************
*** 545,551
int argc;
char **argv;
{
! char *last, *name;
struct stat stb;
static struct buffer buffer;
struct buffer *bp;
--- 551,557 -----
int argc;
char **argv;
{
! char *last, *name;
struct stat stb;
static struct buffer buffer;
struct buffer *bp;
Only in kerberos/appl/bsd: rcp.o
Only in kerberos/appl/bsd: rlogin
diff -rc /source/athena/athena.lib/kerberos/appl/bsd/rshd.c kerberos/appl/bsd/rshd.c
*** /source/athena/athena.lib/kerberos/appl/bsd/rshd.c Wed May 17 10:57:22 1989
--- kerberos/appl/bsd/rshd.c Wed Jun 6 01:24:54 1990
***************
*** 43,48
* command\0
* data
*/
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/socket.h>
--- 43,51 -----
* command\0
* data
*/
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/ioctl.h>
#include <sys/param.h>
#include <sys/socket.h>
Only in kerberos/appl/bsd: rshd.o
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: Imakefile,v
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: kcmd.c,v
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: ksu.c,v
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: login.c,v
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: logutil.c,v
Only in /source/athena/athena.lib/kerberos/appl/bsd/RCS: rcp.c,v
diff -rc /source/athena/athena.lib/kerberos/appl/knetd/knetd.c kerberos/appl/knetd/knetd.c
*** /source/athena/athena.lib/kerberos/appl/knetd/knetd.c Tue May 16 14:49:22 1989
--- kerberos/appl/knetd/knetd.c Sat Jun 9 02:51:27 1990
***************
*** 46,51
#include <signal.h>
#include <errno.h>
#include <sys/time.h>
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
--- 46,54 -----
#include <signal.h>
#include <errno.h>
#include <sys/time.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
Only in kerberos/appl/knetd: knetd.o
Only in kerberos/appl/knetd: parse.o
diff -rc /source/athena/athena.lib/kerberos/appl/tftp/tftp.c kerberos/appl/tftp/tftp.c
*** /source/athena/athena.lib/kerberos/appl/tftp/tftp.c Wed Mar 16 18:40:24 1988
--- kerberos/appl/tftp/tftp.c Sat Jun 9 17:11:15 1990
***************
*** 80,85
struct conn *cn; /* connection block */
int succ; /* success code */
struct conn *mk_conn(); /* make a connection */
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
--- 80,86 -----
struct conn *cn; /* connection block */
int succ; /* success code */
struct conn *mk_conn(); /* make a connection */
+ #ifndef macII
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
#else
***************
*** 82,87
struct conn *mk_conn(); /* make a connection */
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
time (&start);
--- 83,97 -----
#ifndef macII
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
+ #else
+ {
+ setvbuf (stderr, ebuffer, _IOFBF, EBUFSIZ);
+ }
+ {
+ static char buf[BUFSIZ];
+ setvbuf (stderr, buf, _IOLBF, BUFSIZ);
+ }
+ #endif
time (&start);
Only in kerberos/appl/tftp: tftp.o
Only in kerberos/appl/tftp: tftpd
diff -rc /source/athena/athena.lib/kerberos/appl/tftp/tftpd.c kerberos/appl/tftp/tftpd.c
*** /source/athena/athena.lib/kerberos/appl/tftp/tftpd.c Wed Mar 16 18:40:28 1988
--- kerberos/appl/tftp/tftpd.c Sat Jun 9 17:03:23 1990
***************
*** 68,73
int pid; /* parent proc. id */
int sockname[20];
int namelen = 80;
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
setbuf(stdout, NULL);
--- 68,74 -----
int pid; /* parent proc. id */
int sockname[20];
int namelen = 80;
+ #ifndef macII
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
#else
***************
*** 70,75
int namelen = 80;
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
setbuf(stdout, NULL);
umask(0);
#ifndef INETD
--- 71,86 -----
#ifndef macII
setbuffer(stderr, ebuffer, EBUFSIZ);
setlinebuf(stderr);
+ #else
+ {
+ /* static char ebuf[EBUFSIZ]; */
+ setvbuf (stderr, ebuffer, _IOFBF, EBUFSIZ);
+ }
+ {
+ static char buf[BUFSIZ];
+ setvbuf (stderr, buf, _IOLBF, BUFSIZ);
+ }
+ #endif
setbuf(stdout, NULL);
umask(0);
#ifndef INETD
Only in kerberos/appl/tftp: tftpd.o
Only in kerberos/appl/tftp: tmpnam.o
Only in kerberos/appl/tftp: udp.o
Only in kerberos/appl/tftp: user_cmds.o
Only in kerberos/appl/tftp: user_log.o
diff -rc /source/athena/athena.lib/kerberos/include/osconf.h kerberos/include/osconf.h
*** /source/athena/athena.lib/kerberos/include/osconf.h Tue Apr 24 16:38:54 1990
--- kerberos/include/osconf.h Wed May 2 16:05:51 1990
***************
*** 13,18
#include <mit-copyright.h>
#ifdef tahoe
#include "conf-bsdtahoe.h"
#else /* !tahoe */
--- 13,20 -----
#include <mit-copyright.h>
+ #ifdef macII
+ #include "conf-aux.h"
#ifdef tahoe
***************
*** 14,19
#include <mit-copyright.h>
#ifdef tahoe
#include "conf-bsdtahoe.h"
#else /* !tahoe */
#ifdef vax
--- 16,23 -----
#ifdef macII
#include "conf-aux.h"
#ifdef tahoe
+
+
#include "conf-bsdtahoe.h"
#else /* !tahoe */
#ifdef vax
***************
*** 47,50
#endif /* ibm032 */
#endif /* mips */
#endif /* vax */
! #endif /* tahoe */
--- 51,55 -----
#endif /* ibm032 */
#endif /* mips */
#endif /* vax */
! #endif /*tahoe */
! #endif /* mac */
Only in /source/athena/athena.lib/kerberos/include/RCS: krb.h,v
Only in kerberos/kadmin: 1
diff -rc /source/athena/athena.lib/kerberos/kadmin/admin_server.c kerberos/kadmin/admin_server.c
*** /source/athena/athena.lib/kerberos/kadmin/admin_server.c Tue Apr 24 16:39:03 1990
--- kerberos/kadmin/admin_server.c Sat Jun 9 02:36:32 1990
***************
*** 36,41
#include <krb_db.h>
#include "kadm_server.h"
/* Almost all procs and such need this, so it is global */
admin_params prm; /* The command line parameters struct */
--- 36,47 -----
#include <krb_db.h>
#include "kadm_server.h"
+ #ifdef macII
+ #define FD_ZERO(p) ((p)->fds_bits[0] = 0)
+ #define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n)))
+ #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n)))
+ #endif
+
/* Almost all procs and such need this, so it is global */
admin_params prm; /* The command line parameters struct */
Only in kerberos/kadmin: admin_server.o
Only in kerberos/kadmin: kadm_funcs.o
Only in kerberos/kadmin: kadm_ser_wrap.o
diff -rc /source/athena/athena.lib/kerberos/kadmin/kadm_server.c kerberos/kadmin/kadm_server.c
*** /source/athena/athena.lib/kerberos/kadmin/kadm_server.c Tue Sep 26 09:30:14 1989
--- kerberos/kadmin/kadm_server.c Sat Jun 9 02:14:28 1990
***************
*** 20,25
#include <kadm.h>
#include <kadm_err.h>
/*
kadm_ser_cpw - the server side of the change_password routine
recieves : KTEXT, {key}
--- 20,31 -----
#include <kadm.h>
#include <kadm_err.h>
+ #ifdef macII
+ #define FD_ZERO(p) ((p)->fds_bits[0] = 0)
+ #define FD_SET(n, p) ((p)->fds_bits[0] |= (1 << (n)))
+ #define FD_ISSET(n, p) ((p)->fds_bits[0] & (1 << (n)))
+ #endif
+
/*
kadm_ser_cpw - the server side of the change_password routine
recieves : KTEXT, {key}
Only in kerberos/kadmin: kadm_server.o
Only in kerberos/kadmin: kadmin
Only in kerberos/kadmin: kadmin.o
Only in kerberos/kadmin: kadmin_cmds.c
Only in kerberos/kadmin: kadmin_cmds.o
Only in kerberos/kadmin: kadmind
Only in kerberos/kadmin: kpasswd
Only in kerberos/kadmin: kpasswd.o
Only in kerberos/kadmin: ksrvutil
Only in kerberos/kadmin: ksrvutil.o
Only in kerberos/kadmin: test
diff -rc /source/athena/athena.lib/kerberos/kuser/klist.c kerberos/kuser/klist.c
*** /source/athena/athena.lib/kerberos/kuser/klist.c Wed Aug 30 11:19:23 1989
--- kerberos/kuser/klist.c Thu Jun 7 16:44:42 1990
***************
*** 17,22
#endif lint
#include <mit-copyright.h>
#include <stdio.h>
#include <strings.h>
#include <sys/file.h>
--- 17,25 -----
#endif lint
#include <mit-copyright.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <stdio.h>
#include <strings.h>
#include <sys/file.h>
Only in kerberos/kuser: klist.o
Only in kerberos/kuser: ksrvtgt
Only in kerberos/kuser: ksrvtgt.o
diff -rc /source/athena/athena.lib/kerberos/kuser/ksu.c kerberos/kuser/ksu.c
*** /source/athena/athena.lib/kerberos/kuser/ksu.c Mon Jan 23 10:00:24 1989
--- kerberos/kuser/ksu.c Sun Jun 10 01:33:31 1990
***************
*** 42,47
#endif /* not lint */
#include <mit-copyright.h>
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
--- 42,50 -----
#endif /* not lint */
#include <mit-copyright.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/param.h>
#include <sys/time.h>
#include <sys/resource.h>
***************
*** 135,140
argv += optind;
errno = 0;
prio = getpriority(PRIO_PROCESS, 0);
if (errno)
prio = 0;
--- 138,144 -----
argv += optind;
errno = 0;
+ #ifndef macII
prio = getpriority(PRIO_PROCESS, 0);
#endif
if (errno)
***************
*** 136,141
errno = 0;
prio = getpriority(PRIO_PROCESS, 0);
if (errno)
prio = 0;
(void)setpriority(PRIO_PROCESS, 0, -2);
--- 140,146 -----
errno = 0;
#ifndef macII
prio = getpriority(PRIO_PROCESS, 0);
+ #endif
if (errno)
prio = 0;
#ifndef macII
***************
*** 138,143
prio = getpriority(PRIO_PROCESS, 0);
if (errno)
prio = 0;
(void)setpriority(PRIO_PROCESS, 0, -2);
/* get current login name and shell */
--- 143,149 -----
#endif
if (errno)
prio = 0;
+ #ifndef macII
(void)setpriority(PRIO_PROCESS, 0, -2);
#endif
***************
*** 139,144
if (errno)
prio = 0;
(void)setpriority(PRIO_PROCESS, 0, -2);
/* get current login name and shell */
if ((pwd = getpwuid(ruid = getuid())) == NULL) {
--- 145,151 -----
prio = 0;
#ifndef macII
(void)setpriority(PRIO_PROCESS, 0, -2);
+ #endif
/* get current login name and shell */
if ((pwd = getpwuid(ruid = getuid())) == NULL) {
***************
*** 201,206
username, mytty, krb_err_txt[kerno]);
exit(1);
}
setpriority(PRIO_PROCESS, 0, -2);
/*
* Now use the ticket for something useful, to make sure
--- 208,214 -----
username, mytty, krb_err_txt[kerno]);
exit(1);
}
+ #ifndef macII
setpriority(PRIO_PROCESS, 0, -2);
#endif
/*
***************
*** 202,207
exit(1);
}
setpriority(PRIO_PROCESS, 0, -2);
/*
* Now use the ticket for something useful, to make sure
* it is valid.
--- 210,216 -----
}
#ifndef macII
setpriority(PRIO_PROCESS, 0, -2);
+ #endif
/*
* Now use the ticket for something useful, to make sure
* it is valid.
Only in kerberos/kuser: ksu.o
diff -rc /source/athena/athena.lib/kerberos/lib/des/misc.c kerberos/lib/des/misc.c
*** /source/athena/athena.lib/kerberos/lib/des/misc.c Tue Nov 15 11:30:40 1988
--- kerberos/lib/des/misc.c Tue May 1 01:05:00 1990
***************
*** 15,20
#include <mit-copyright.h>
#include <stdio.h>
#include "des_internal.h"
/*
--- 15,23 -----
#include <mit-copyright.h>
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include "des_internal.h"
/*
Only in kerberos/lib/des: misc.o
Only in kerberos/lib/des: new_rnd_key.o
Only in kerberos/lib/des: odd.h
Only in kerberos/lib/des: p.c
Only in kerberos/lib/des: p_table.h
Only in kerberos/lib/des: pcbc_encrypt.o
Common subdirectories: /source/athena/athena.lib/kerberos/lib/des/profiled and kerberos/lib/des/profiled
Only in kerberos/lib/des: quad_cksum.o
diff -rc /source/athena/athena.lib/kerberos/lib/des/random_key.c kerberos/lib/des/random_key.c
*** /source/athena/athena.lib/kerberos/lib/des/random_key.c Sat Jan 21 16:50:29 1989
--- kerberos/lib/des/random_key.c Wed Jun 6 12:01:24 1990
***************
*** 37,42
#include <sys/time.h>
#endif
extern int des_debug;
extern int des_debug_print();
--- 37,46 -----
#include <sys/time.h>
#endif
+ #ifdef macII
+ #include <time.h>
+ #endif
+
extern int des_debug;
extern int des_debug_print();
***************
*** 62,67
int i,j;
#ifdef BSDUNIX
static struct timeval time;
if (!p) {
--- 66,77 -----
int i,j;
#ifdef BSDUNIX
+
+ #ifdef macII
+ #define random lrand48
+ #define srandom srand48
+ #endif
+
static struct timeval time;
if (!p) {
Only in kerberos/lib/des: random_key.o
diff -rc /source/athena/athena.lib/kerberos/lib/des/read_password.c kerberos/lib/des/read_password.c
*** /source/athena/athena.lib/kerberos/lib/des/read_password.c Tue May 30 18:01:46 1989
--- kerberos/lib/des/read_password.c Thu Jun 7 16:57:24 1990
***************
*** 21,27
#include <mit-copyright.h>
#include <des.h>
#include "conf.h"
!
#include <stdio.h>
#ifdef BSDUNIX
#include <strings.h>
--- 21,29 -----
#include <mit-copyright.h>
#include <des.h>
#include "conf.h"
! #ifdef macII
! #undef BSDUNIX
! #endif
#include <stdio.h>
#ifdef BSDUNIX
#include <strings.h>
***************
*** 29,34
#include <signal.h>
#include <setjmp.h>
#else
char *strcpy();
int strcmp();
char *index();
--- 31,39 -----
#include <signal.h>
#include <setjmp.h>
#else
+ #ifdef SYSV
+ #include <sys/termio.h>
+ #endif
char *strcpy();
int strcmp();
char *index();
***************
*** 45,51
typedef int sigtype;
#endif
static sigtype sig_restore();
! static push_signals(), pop_signals();
int des_read_pw_string();
#endif
--- 50,56 -----
typedef int sigtype;
#endif
static sigtype sig_restore();
! /* static push_signals(), pop_signals(); */
int des_read_pw_string();
#endif
***************
*** 94,99
#ifdef BSDUNIX
jmp_buf old_env;
struct sgttyb tty_state;
#endif
char key_string[BUFSIZ];
--- 99,107 -----
#ifdef BSDUNIX
jmp_buf old_env;
struct sgttyb tty_state;
+ #else
+ #ifdef SYSV
+ struct termio tty_state;
#endif
#endif
char key_string[BUFSIZ];
***************
*** 95,100
jmp_buf old_env;
struct sgttyb tty_state;
#endif
char key_string[BUFSIZ];
if (max > BUFSIZ) {
--- 103,109 -----
#ifdef SYSV
struct termio tty_state;
#endif
+ #endif
char key_string[BUFSIZ];
if (max > BUFSIZ) {
***************
*** 111,117
if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1)
return -1;
! push_signals();
/* Turn off echo */
tty_state.sg_flags &= ~ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
--- 120,126 -----
if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1)
return -1;
! /* push_signals(); */
/* Turn off echo */
tty_state.sg_flags &= ~ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
***************
*** 116,121
tty_state.sg_flags &= ~ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
return -1;
#endif
while (!ok) {
(void) printf(prompt);
--- 125,141 -----
tty_state.sg_flags &= ~ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
return -1;
+ #else
+ #ifdef SYSV
+ /* save terminal state*/
+ if (ioctl(0,TCGETA,(char *)&tty_state) == -1)
+ return -1;
+
+ /* push_signals(); */
+ /* Turn off echo */
+ tty_state.c_lflag &= ~ECHO;
+ if (ioctl(0,TCSETA,(char *)&tty_state) == -1)
+ return -1;
#endif
#endif
while (!ok) {
***************
*** 117,122
if (ioctl(0,TIOCSETP,(char *)&tty_state) == -1)
return -1;
#endif
while (!ok) {
(void) printf(prompt);
(void) fflush(stdout);
--- 137,143 -----
if (ioctl(0,TCSETA,(char *)&tty_state) == -1)
return -1;
#endif
+ #endif
while (!ok) {
(void) printf(prompt);
(void) fflush(stdout);
***************
*** 165,171
tty_state.sg_flags |= ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state))
ok = 0;
! pop_signals();
bcopy((char *)env, (char *)old_env, sizeof(env));
#endif
if (verify)
--- 186,192 -----
tty_state.sg_flags |= ECHO;
if (ioctl(0,TIOCSETP,(char *)&tty_state))
ok = 0;
! /* pop_signals(); */
bcopy((char *)env, (char *)old_env, sizeof(env));
#else
#ifdef SYSV
***************
*** 167,172
ok = 0;
pop_signals();
bcopy((char *)env, (char *)old_env, sizeof(env));
#endif
if (verify)
bzero(key_string, sizeof (key_string));
--- 188,202 -----
ok = 0;
/* pop_signals(); */
bcopy((char *)env, (char *)old_env, sizeof(env));
+ #else
+ #ifdef SYSV
+ printf("\n");
+ /* turn echo back on */
+ tty_state.c_lflag |= ECHO;
+ if (ioctl(0,TCSETA,(char *)&tty_state))
+ ok = 0;
+ /* pop_signals(); */
+ #endif
#endif
if (verify)
bzero(key_string, sizeof (key_string));
Only in kerberos/lib/des: read_password.c.orig
Only in kerberos/lib/des: read_password.o
Only in kerberos/lib/des: s_table.h
Only in kerberos/lib/des: string_to_key.o
Only in kerberos/lib/des: testit
Only in kerberos/lib/des: util.o
Only in kerberos/lib/des: verify
Only in kerberos/lib/des: weak_key.o
Only in kerberos/lib/kadm: Makefile
Only in kerberos/lib/kadm: Makefile.bak
Common subdirectories: /source/athena/athena.lib/kerberos/lib/kadm/RCS and kerberos/lib/kadm/RCS
Only in kerberos/lib/kadm: kadm_cli_wrap.o
Only in kerberos/lib/kadm: kadm_err.h
Only in kerberos/lib/kadm: kadm_err.o
Only in kerberos/lib/kadm: kadm_stream.o
Only in kerberos/lib/kadm: kadm_supp.o
Only in kerberos/lib/kadm: libkadm.a
Common subdirectories: /source/athena/athena.lib/kerberos/lib/kadm/profiled and kerberos/lib/kadm/profiled
diff -rc /source/athena/athena.lib/kerberos/lib/kdb/krb_kdb_utils.c kerberos/lib/kdb/krb_kdb_utils.c
*** /source/athena/athena.lib/kerberos/lib/kdb/krb_kdb_utils.c Wed Jul 26 11:01:29 1989
--- kerberos/lib/kdb/krb_kdb_utils.c Tue May 1 01:56:00 1990
***************
*** 25,30
#include <krb_db.h>
#include <kdc.h>
#include <stdio.h>
#include <sys/file.h>
long kdb_get_master_key(prompt, master_key, master_key_sched)
--- 25,33 -----
#include <krb_db.h>
#include <kdc.h>
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
long kdb_get_master_key(prompt, master_key, master_key_sched)
Only in kerberos/lib/kdb: krb_kdb_utils.o
diff -rc /source/athena/athena.lib/kerberos/lib/kdb/krb_lib.c kerberos/lib/kdb/krb_lib.c
*** /source/athena/athena.lib/kerberos/lib/kdb/krb_lib.c Tue Apr 24 16:40:31 1990
--- kerberos/lib/kdb/krb_lib.c Tue Jun 5 23:57:29 1990
***************
*** 19,24
#include <netinet/in.h>
#include <sys/uio.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <strings.h>
#include <des.h>
--- 19,27 -----
#include <netinet/in.h>
#include <sys/uio.h>
#include <sys/time.h>
+ #ifdef macII
+ #include <time.h>
+ #endif
#include <sys/resource.h>
#include <strings.h>
#include <des.h>
Only in kerberos/lib/kdb: krb_lib.o
Only in kerberos/lib/kdb: libkdb.a
diff -rc /source/athena/athena.lib/kerberos/lib/kdb/print_princ.c kerberos/lib/kdb/print_princ.c
*** /source/athena/athena.lib/kerberos/lib/kdb/print_princ.c Tue Jan 24 18:14:20 1989
--- kerberos/lib/kdb/print_princ.c Tue Jun 5 23:59:09 1990
***************
*** 17,22
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
#include <strings.h>
#include <krb.h>
#include <krb_db.h>
--- 17,25 -----
#include <stdio.h>
#include <sys/types.h>
#include <sys/time.h>
+ #ifdef macII
+ #include <time.h>
+ #endif
#include <strings.h>
#include <krb.h>
#include <krb_db.h>
Only in kerberos/lib/kdb: print_princ.o
Common subdirectories: /source/athena/athena.lib/kerberos/lib/kdb/profiled and kerberos/lib/kdb/profiled
diff -rc /source/athena/athena.lib/kerberos/lib/krb/klog.c kerberos/lib/krb/klog.c
*** /source/athena/athena.lib/kerberos/lib/krb/klog.c Thu Dec 1 14:06:01 1988
--- kerberos/lib/krb/klog.c Tue Jun 5 23:46:56 1990
***************
*** 17,23
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h>
!
#include <krb.h>
#include <klog.h>
--- 17,25 -----
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h>
! #ifdef macII
! #include <time.h>
! #endif
#include <krb.h>
#include <klog.h>
Only in kerberos/lib/krb: klog.o
Only in kerberos/lib/krb: kname_parse.o
Only in kerberos/lib/krb: kntoln.o
Only in kerberos/lib/krb: kntoln.s
Only in kerberos/lib/krb: kparse.o
Only in kerberos/lib/krb: krb_err.h
Only in kerberos/lib/krb: krb_err.o
Only in kerberos/lib/krb: krb_err_txt.o
diff -rc /source/athena/athena.lib/kerberos/lib/krb/krb_get_in_tkt.c kerberos/lib/krb/krb_get_in_tkt.c
*** /source/athena/athena.lib/kerberos/lib/krb/krb_get_in_tkt.c Wed May 2 20:00:49 1990
--- kerberos/lib/krb/krb_get_in_tkt.c Tue May 1 01:34:22 1990
***************
*** 1,6
/*
! * $Source: /afs/rel-eng.athena.mit.edu/project/release/current/source/athena/athena.lib/kerberos/lib/krb/RCS/krb_get_in_tkt.c,v $
! * $Author: jon $
*
* Copyright 1986, 1987, 1988 by the Massachusetts Institute
* of Technology.
--- 1,6 -----
/*
! * $Source: /mit/kerberos/src/lib/krb/RCS/krb_get_in_tkt.c,v $
! * $Author: jtkohl $
*
* Copyright 1986, 1987, 1988 by the Massachusetts Institute
* of Technology.
***************
*** 11,17
#ifndef lint
static char *rcsid_krb_get_in_tkt_c =
! "$Id: krb_get_in_tkt.c,v 4.20 90/05/02 15:25:55 jon Exp $";
#endif /* lint */
#include <mit-copyright.h>
--- 11,17 -----
#ifndef lint
static char *rcsid_krb_get_in_tkt_c =
! "$Header: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp $";
#endif /* lint */
#include <mit-copyright.h>
***************
*** 24,30
#include <errno.h>
/* use the bsd time.h struct defs for PC too! */
- #include <sys/time.h>
#include <sys/types.h>
int swap_bytes;
--- 24,29 -----
#include <errno.h>
/* use the bsd time.h struct defs for PC too! */
#include <sys/types.h>
#include <sys/time.h>
***************
*** 26,31
/* use the bsd time.h struct defs for PC too! */
#include <sys/time.h>
#include <sys/types.h>
int swap_bytes;
--- 25,31 -----
/* use the bsd time.h struct defs for PC too! */
#include <sys/types.h>
+ #include <sys/time.h>
int swap_bytes;
***************
*** 165,171
pkt->length = 3 + strlen(user);
(void) strcpy((char *)(pkt->dat+pkt->length),
instance); /* instance */
- instance[INST_SZ-1] = '\0';
pkt->length += 1 + strlen(instance);
(void) strcpy((char *)(pkt->dat+pkt->length),realm); /* realm */
pkt->length += 1 + strlen(realm);
--- 165,170 -----
pkt->length = 3 + strlen(user);
(void) strcpy((char *)(pkt->dat+pkt->length),
instance); /* instance */
pkt->length += 1 + strlen(instance);
(void) strcpy((char *)(pkt->dat+pkt->length),realm); /* realm */
pkt->length += 1 + strlen(realm);
***************
*** 179,185
(void) strcpy((char *)(pkt->dat+pkt->length),service);
pkt->length += 1 + strlen(service);
(void) strcpy((char *)(pkt->dat+pkt->length),sinstance);
-
pkt->length += 1 + strlen(sinstance);
rpkt->length = 0;
--- 178,183 -----
(void) strcpy((char *)(pkt->dat+pkt->length),service);
pkt->length += 1 + strlen(service);
(void) strcpy((char *)(pkt->dat+pkt->length),sinstance);
pkt->length += 1 + strlen(sinstance);
rpkt->length = 0;
***************
*** 240,247
return(INTK_BADPW);
/* extract server's name */
! (void) strncpy(s_name,ptr, sizeof(s_name)-1);
! s_name[sizeof(s_name)-1] = '\0';
ptr += strlen(s_name) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
--- 238,244 -----
return(INTK_BADPW);
/* extract server's name */
! (void) strcpy(s_name,ptr);
ptr += strlen(s_name) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
***************
*** 248,255
return(INTK_BADPW);
/* extract server's instance */
! (void) strncpy(s_instance,ptr, sizeof(s_instance)-1);
! s_instance[sizeof(s_instance)-1] = '\0';
ptr += strlen(s_instance) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
--- 245,251 -----
return(INTK_BADPW);
/* extract server's instance */
! (void) strcpy(s_instance,ptr);
ptr += strlen(s_instance) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
***************
*** 256,263
return(INTK_BADPW);
/* extract server's realm */
! (void) strncpy(rlm,ptr, sizeof(rlm));
! rlm[sizeof(rlm)-1] = '\0';
ptr += strlen(rlm) + 1;
/* extract ticket lifetime, server key version, ticket length */
--- 252,258 -----
return(INTK_BADPW);
/* extract server's realm */
! (void) strcpy(rlm,ptr);
ptr += strlen(rlm) + 1;
/* extract ticket lifetime, server key version, ticket length */
Only in kerberos/lib/krb: krb_get_in_tkt.o
diff -rc /source/athena/athena.lib/kerberos/lib/krb/kuserok.c kerberos/lib/krb/kuserok.c
*** /source/athena/athena.lib/kerberos/lib/krb/kuserok.c Mon Jan 23 09:25:12 1989
--- kerberos/lib/krb/kuserok.c Tue May 1 01:23:19 1990
***************
*** 18,23
#include <mit-copyright.h>
#include <krb.h>
#include <stdio.h>
#include <pwd.h>
--- 18,26 -----
#include <mit-copyright.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <krb.h>
#include <stdio.h>
#include <pwd.h>
Only in kerberos/lib/krb: kuserok.o
Only in kerberos/lib/krb: libkrb.a
diff -rc /source/athena/athena.lib/kerberos/lib/krb/log.c kerberos/lib/krb/log.c
*** /source/athena/athena.lib/kerberos/lib/krb/log.c Thu Dec 1 14:15:07 1988
--- kerberos/lib/krb/log.c Tue Jun 5 23:48:58 1990
***************
*** 17,23
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h>
!
#include <krb.h>
#include <klog.h>
--- 17,25 -----
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h>
! #ifdef macII
! #include <time.h>
! #endif
#include <krb.h>
#include <klog.h>
Only in kerberos/lib/krb: log.o
Only in kerberos/lib/krb: mk_err.o
Only in kerberos/lib/krb: mk_priv.o
Only in kerberos/lib/krb: mk_req.o
Only in kerberos/lib/krb: mk_safe.o
Only in kerberos/lib/krb: month_sname.o
Only in kerberos/lib/krb: netread.o
Only in kerberos/lib/krb: netwrite.o
Only in kerberos/lib/krb: one.o
Only in kerberos/lib/krb: pkt_cipher.o
Only in kerberos/lib/krb: pkt_clen.o
Common subdirectories: /source/athena/athena.lib/kerberos/lib/krb/profiled and kerberos/lib/krb/profiled
Only in kerberos/lib/krb: rd_err.o
Only in kerberos/lib/krb: rd_priv.o
Only in kerberos/lib/krb: rd_req.o
Only in kerberos/lib/krb: rd_safe.o
Only in kerberos/lib/krb: read_service_key.o
Only in kerberos/lib/krb: recvauth.o
Only in kerberos/lib/krb: save_credentials.o
diff -rc /source/athena/athena.lib/kerberos/lib/krb/send_to_kdc.c kerberos/lib/krb/send_to_kdc.c
*** /source/athena/athena.lib/kerberos/lib/krb/send_to_kdc.c Tue Jul 25 17:54:39 1989
--- kerberos/lib/krb/send_to_kdc.c Wed Jun 6 01:28:22 1990
***************
*** 30,35
#include <netdb.h>
#include <strings.h>
#define S_AD_SZ sizeof(struct sockaddr_in)
extern int errno;
--- 30,68 -----
#include <netdb.h>
#include <strings.h>
+ #ifdef macII
+ #define NBBY 8 /* number of bits in a byte */
+ /*
+ * Select uses bit masks of file descriptors in longs.
+ * These macros manipulate such bit fields (the filesystem macros use chars).
+ * FD_SETSIZE may be defined by the user, but the default here
+ * should be >= NOFILE (param.h).
+ */
+ #ifndef FD_SETSIZE
+ #define FD_SETSIZE 32
+ #endif
+
+ typedef long fd_mask;
+ #define NFDBITS (sizeof(fd_mask) * NBBY) /* bits per mask */
+ #ifndef howmany
+ #define howmany(x, y) (((x)+((y)-1))/(y))
+ #endif
+
+ /*
+ * struct fd_set already appears in types.h
+ *
+
+ typedef struct fd_set {
+ fd_mask fds_bits[howmany(FD_SETSIZE, NFDBITS)];
+ } fd_set;
+ */
+
+ #define FD_SET(n, p) ((p)->fds_bits[(n)/NFDBITS] |= (1 << ((n) % NFDBITS)))
+ #define FD_CLR(n, p) ((p)->fds_bits[(n)/NFDBITS] &= ~(1 << ((n) % NFDBITS)))
+ #define FD_ISSET(n, p) ((p)->fds_bits[(n)/NFDBITS] & (1 << ((n) % NFDBITS)))
+ #define FD_ZERO(p) bzero((char *)(p), sizeof(*(p)))
+
+ #endif /* macII */
#define S_AD_SZ sizeof(struct sockaddr_in)
extern int errno;
Only in kerberos/lib/krb: send_to_kdc.o
Only in kerberos/lib/krb: sendauth.o
diff -rc /source/athena/athena.lib/kerberos/lib/krb/stime.c kerberos/lib/krb/stime.c
*** /source/athena/athena.lib/kerberos/lib/krb/stime.c Tue Nov 15 16:57:59 1988
--- kerberos/lib/krb/stime.c Tue Jun 5 23:51:25 1990
***************
*** 17,23
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h> /* for sprintf() */
!
/*
* Given a pointer to a long containing the number of seconds
* since the beginning of time (midnight 1 Jan 1970 GMT), return
--- 17,25 -----
#include <mit-copyright.h>
#include <sys/time.h>
#include <stdio.h> /* for sprintf() */
! #ifdef macII
! #include <time.h>
! #endif
/*
* Given a pointer to a long containing the number of seconds
* since the beginning of time (midnight 1 Jan 1970 GMT), return
Only in kerberos/lib/krb: stime.o
Common subdirectories: /source/athena/athena.lib/kerberos/lib/krb/test and kerberos/lib/krb/test
Only in kerberos/lib/krb: tf_util.o
Only in kerberos/lib/krb: tkt_string.o
Only in kerberos/lib/krb: util.o
diff -rc /source/athena/athena.lib/kerberos/lib/krb/RCS/krb_get_in_tkt.c,v kerberos/lib/krb/RCS/krb_get_in_tkt.c,v
*** /source/athena/athena.lib/kerberos/lib/krb/RCS/krb_get_in_tkt.c,v Wed May 2 20:00:34 1990
--- kerberos/lib/krb/RCS/krb_get_in_tkt.c,v Mon Apr 30 22:04:56 1990
***************
*** 1,4
! head 4.20;
branch ;
access ;
symbols ASR7PT0_SNAP0:4.19 PATCH9:4.19 PATCH8:4.19 PATCH7:4.19 KPATCH6:4.19 ASRSNAP1001:4.19 PATCH5:4.19 KPATCH4:4.17 KPATCH3:4.17 KPATCH2:4.16 KREL1:4.14 BETA5/24/88:4.9;
--- 1,4 -----
! head 4.19;
branch ;
access ;
symbols PATCH5:4.19 KPATCH4:4.17 KPATCH3:4.17 KPATCH2:4.16 KREL1:4.14 BETA5/24/88:4.9;
***************
*** 1,7
head 4.20;
branch ;
access ;
! symbols ASR7PT0_SNAP0:4.19 PATCH9:4.19 PATCH8:4.19 PATCH7:4.19 KPATCH6:4.19 ASRSNAP1001:4.19 PATCH5:4.19 KPATCH4:4.17 KPATCH3:4.17 KPATCH2:4.16 KREL1:4.14 BETA5/24/88:4.9;
locks ; strict;
comment @ * @;
--- 1,7 -----
head 4.19;
branch ;
access ;
! symbols PATCH5:4.19 KPATCH4:4.17 KPATCH3:4.17 KPATCH2:4.16 KREL1:4.14 BETA5/24/88:4.9;
locks ; strict;
comment @ * @;
***************
*** 6,16
comment @ * @;
- 4.20
- date 90.05.02.15.25.55; author jon; state Exp;
- branches ;
- next 4.19;
-
4.19
date 89.07.18.16.31.31; author jtkohl; state Exp;
branches ;
--- 6,11 -----
comment @ * @;
4.19
date 89.07.18.16.31.31; author jtkohl; state Exp;
branches ;
***************
*** 147,153
@
! 4.20
log
@Be more careful instead of just believing lengths from reply packets
Programmer: jtkohl
--- 142,148 -----
@
! 4.19
log
@changes to allow alternate decryption routine for ticket responses from
KDC.
***************
*** 149,157
4.20
log
! @Be more careful instead of just believing lengths from reply packets
! Programmer: jtkohl
! Auditor: jon
@
text
@/*
--- 144,153 -----
4.19
log
! @changes to allow alternate decryption routine for ticket responses from
! KDC.
! Programmer: Jay Berkenbilt
! Auditor: John Kohl
@
text
@/*
***************
*** 155,162
@
text
@/*
! * $Source: /afs/athena.mit.edu/astaff/project/kerberos/src/lib/krb/RCS/krb_get_in_tkt.c,v $
! * $Author: jtkohl $
*
* Copyright 1986, 1987, 1988 by the Massachusetts Institute
* of Technology.
--- 151,158 -----
@
text
@/*
! * $Source: /mit/kerberos/src/lib/krb/RCS/krb_get_in_tkt.c,v $
! * $Author: qjb $
*
* Copyright 1986, 1987, 1988 by the Massachusetts Institute
* of Technology.
***************
*** 167,173
#ifndef lint
static char *rcsid_krb_get_in_tkt_c =
! "$Id: krb_get_in_tkt.c,v 4.19 89/07/18 16:31:31 jtkohl Exp Locker: jtkohl $";
#endif /* lint */
#include <mit-copyright.h>
--- 163,169 -----
#ifndef lint
static char *rcsid_krb_get_in_tkt_c =
! "$Header: krb_get_in_tkt.c,v 4.18 89/06/26 14:50:52 qjb Locked $";
#endif /* lint */
#include <mit-copyright.h>
***************
*** 321,327
pkt->length = 3 + strlen(user);
(void) strcpy((char *)(pkt->dat+pkt->length),
instance); /* instance */
- instance[INST_SZ-1] = '\0';
pkt->length += 1 + strlen(instance);
(void) strcpy((char *)(pkt->dat+pkt->length),realm); /* realm */
pkt->length += 1 + strlen(realm);
--- 317,322 -----
pkt->length = 3 + strlen(user);
(void) strcpy((char *)(pkt->dat+pkt->length),
instance); /* instance */
pkt->length += 1 + strlen(instance);
(void) strcpy((char *)(pkt->dat+pkt->length),realm); /* realm */
pkt->length += 1 + strlen(realm);
***************
*** 335,341
(void) strcpy((char *)(pkt->dat+pkt->length),service);
pkt->length += 1 + strlen(service);
(void) strcpy((char *)(pkt->dat+pkt->length),sinstance);
-
pkt->length += 1 + strlen(sinstance);
rpkt->length = 0;
--- 330,335 -----
(void) strcpy((char *)(pkt->dat+pkt->length),service);
pkt->length += 1 + strlen(service);
(void) strcpy((char *)(pkt->dat+pkt->length),sinstance);
pkt->length += 1 + strlen(sinstance);
rpkt->length = 0;
***************
*** 396,403
return(INTK_BADPW);
/* extract server's name */
! (void) strncpy(s_name,ptr, sizeof(s_name)-1);
! s_name[sizeof(s_name)-1] = '\0';
ptr += strlen(s_name) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
--- 390,396 -----
return(INTK_BADPW);
/* extract server's name */
! (void) strcpy(s_name,ptr);
ptr += strlen(s_name) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
***************
*** 404,411
return(INTK_BADPW);
/* extract server's instance */
! (void) strncpy(s_instance,ptr, sizeof(s_instance)-1);
! s_instance[sizeof(s_instance)-1] = '\0';
ptr += strlen(s_instance) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
--- 397,403 -----
return(INTK_BADPW);
/* extract server's instance */
! (void) strcpy(s_instance,ptr);
ptr += strlen(s_instance) + 1;
if ((strlen(ptr) + (ptr - (char *) cip->dat)) > cip->length)
***************
*** 412,419
return(INTK_BADPW);
/* extract server's realm */
! (void) strncpy(rlm,ptr, sizeof(rlm));
! rlm[sizeof(rlm)-1] = '\0';
ptr += strlen(rlm) + 1;
/* extract ticket lifetime, server key version, ticket length */
--- 404,410 -----
return(INTK_BADPW);
/* extract server's realm */
! (void) strcpy(rlm,ptr);
ptr += strlen(rlm) + 1;
/* extract ticket lifetime, server key version, ticket length */
***************
*** 458,492
return(INTK_OK);
}
- @
-
-
- 4.19
- log
- @changes to allow alternate decryption routine for ticket responses from
- KDC.
- Programmer: Jay Berkenbilt
- Auditor: John Kohl
- @
- text
- @d2 2
- a3 2
- * $Source: /mit/kerberos/src/lib/krb/RCS/krb_get_in_tkt.c,v $
- * $Author: qjb $
- d14 1
- a14 1
- "$Header: krb_get_in_tkt.c,v 4.18 89/06/26 14:50:52 qjb Locked $";
- d168 1
- d182 1
- d243 2
- a244 1
- (void) strcpy(s_name,ptr);
- d251 2
- a252 1
- (void) strcpy(s_instance,ptr);
- d259 2
- a260 1
- (void) strcpy(rlm,ptr);
@
--- 449,454 -----
return(INTK_OK);
}
@
Only in /source/athena/athena.lib/kerberos/lib/krb/RCS: rd_req.c,v
diff -rc /source/athena/athena.lib/kerberos/slave/kprop.c kerberos/slave/kprop.c
*** /source/athena/athena.lib/kerberos/slave/kprop.c Tue Apr 24 16:41:45 1990
--- kerberos/slave/kprop.c Thu Jun 7 17:30:54 1990
***************
*** 50,55
#include <mit-copyright.h>
#include <stdio.h>
#include <sys/file.h>
#include <signal.h>
#include <sys/types.h>
--- 50,58 -----
#include <mit-copyright.h>
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include <signal.h>
#include <sys/types.h>
Only in kerberos/slave: kprop.o
Only in kerberos/slave: kpropd
Only in kerberos/slave: kpropd.o
Common subdirectories: /source/athena/athena.lib/kerberos/tools/RCS and kerberos/tools/RCS
diff -rc /source/athena/athena.lib/kerberos/util/et/compile_et.c kerberos/util/et/compile_et.c
*** /source/athena/athena.lib/kerberos/util/et/compile_et.c Thu Jul 2 14:17:26 1987
--- kerberos/util/et/compile_et.c Tue May 1 00:42:26 1990
***************
*** 7,12
*/
#include <stdio.h>
#include <sys/file.h>
#include <strings.h>
#include <sys/param.h>
--- 7,15 -----
*/
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include <strings.h>
#include <sys/param.h>
Only in kerberos/util/et: compile_et.o
Only in kerberos/util/et: error_message.o
Only in kerberos/util/et: error_table.c
Only in kerberos/util/et: error_table.o
diff -rc /source/athena/athena.lib/kerberos/util/et/perror.c kerberos/util/et/perror.c
*** /source/athena/athena.lib/kerberos/util/et/perror.c Fri Jul 28 10:30:38 1989
--- kerberos/util/et/perror.c Tue Jun 5 23:31:12 1990
***************
*** 12,17
typedef int (*int_func)();
#if defined(mips) && defined(ultrix)
int errno; /* this is needed to keep the loader from complaining */
#endif
--- 12,23 -----
typedef int (*int_func)();
+ #ifdef macII
+ int errno;
+ char *sys_errlist[];
+ int sys_nerr;
+
+ #endif
#if defined(mips) && defined(ultrix)
int errno; /* this is needed to keep the loader from complaining */
#endif
Only in kerberos/util/et: perror.o
Common subdirectories: /source/athena/athena.lib/kerberos/util/et/profiled and kerberos/util/et/profiled
Only in kerberos/util/et: test
Only in kerberos/util/et: test.o
Only in kerberos/util/et: test1.h
Only in kerberos/util/et: test1.o
Only in kerberos/util/et: test2.h
Only in kerberos/util/et: test2.o
Only in kerberos/util/et/RCS: compile_et.c,v
Only in kerberos/util/imake: Imake.template
diff -rc /source/athena/athena.lib/kerberos/util/imake/imake.c kerberos/util/imake/imake.c
*** /source/athena/athena.lib/kerberos/util/imake/imake.c Wed Aug 30 11:25:32 1989
--- kerberos/util/imake/imake.c Mon Apr 30 22:40:51 1990
***************
*** 1,3
/*
*
* Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
--- 1,14 -----
+ /*****************************************************************************\
+ * *
+ * Porting Note *
+ * *
+ * Add the value of BOOTSTRAPCFLAGS to the cpp_argv table so that it will be *
+ * passed to the template file. *
+ * *
+ \*****************************************************************************/
+
+
+
/*
*
* Copyright 1985, 1986, 1987 by the Massachusetts Institute of Technology
***************
*** 14,20
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
! * $Header: /afs/athena.mit.edu/astaff/project/kerberos/src/util/imake/RCS/imake.c,v 4.1 89/08/30 11:25:31 jtkohl Exp $
* $Locker: $
*
* Author:
--- 25,31 -----
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
! * $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $
* $Locker: $
*
* Author:
***************
*** 24,30
*
* imake: the include-make program.
*
! * Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-v] [make flags]
*
* Imake takes a template makefile (Imake.template) and runs cpp on it
* producing a temporary makefile in /usr/tmp. It then runs make on
--- 35,41 -----
*
* imake: the include-make program.
*
! * Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-e] [-v] [make flags]
*
* Imake takes a template makefile (Imake.tmpl) and runs cpp on it
* producing a temporary makefile in /tmp. It then runs make on
***************
*** 26,33
*
* Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-v] [make flags]
*
! * Imake takes a template makefile (Imake.template) and runs cpp on it
! * producing a temporary makefile in /usr/tmp. It then runs make on
* this pre-processed makefile.
* Options:
* -D define. Same as cpp -D argument.
--- 37,44 -----
*
* Usage: imake [-Idir] [-Ddefine] [-T] [-f imakefile ] [-s] [-e] [-v] [make flags]
*
! * Imake takes a template makefile (Imake.tmpl) and runs cpp on it
! * producing a temporary makefile in /tmp. It then runs make on
* this pre-processed makefile.
* Options:
* -D define. Same as cpp -D argument.
***************
*** 33,40
* -D define. Same as cpp -D argument.
* -I Include directory. Same as cpp -I argument.
* -T template. Designate a template other
! * than Imake.template
! * -s show. Show the produced makefile on the standard
* output. Make is not run is this case. If a file
* argument is provided, the output is placed there.
* -v verbose. Show the make command line executed.
--- 44,51 -----
* -D define. Same as cpp -D argument.
* -I Include directory. Same as cpp -I argument.
* -T template. Designate a template other
! * than Imake.tmpl
! * -s[F] show. Show the produced makefile on the standard
* output. Make is not run is this case. If a file
* argument is provided, the output is placed there.
* -e[F] execute instead of show; optionally name Makefile F
***************
*** 37,42
* -s show. Show the produced makefile on the standard
* output. Make is not run is this case. If a file
* argument is provided, the output is placed there.
* -v verbose. Show the make command line executed.
*
* Environment variables:
--- 48,54 -----
* -s[F] show. Show the produced makefile on the standard
* output. Make is not run is this case. If a file
* argument is provided, the output is placed there.
+ * -e[F] execute instead of show; optionally name Makefile F
* -v verbose. Show the make command line executed.
*
* Environment variables:
***************
*** 41,48
*
* Environment variables:
*
! * IMAKEINCLUDE Include directory to use in addition to
! * "." and "/usr/lib/local/imake.include".
* IMAKECPP Cpp to use instead of /lib/cpp
* IMAKEMAKE make program to use other than what is
* found by searching the $PATH variable.
--- 53,59 -----
*
* Environment variables:
*
! * IMAKEINCLUDE Include directory to use in addition to "."
* IMAKECPP Cpp to use instead of /lib/cpp
* IMAKEMAKE make program to use other than what is
* found by searching the $PATH variable.
***************
*** 64,70
* Call this <imakefile>. This gets added to the arguments for
* make as MAKEFILE=<imakefile>.
* 2. Determine the name of the template from the command line (-T)
! * or the default, Imake.template. Call this <template>
* 3. Start up cpp an provide it with three lines of input:
* #define IMAKE_TEMPLATE "<template>"
* #define INCLUDE_IMAKEFILE "<imakefile>"
--- 75,81 -----
* Call this <imakefile>. This gets added to the arguments for
* make as MAKEFILE=<imakefile>.
* 2. Determine the name of the template from the command line (-T)
! * or the default, Imake.tmpl. Call this <template>
* 3. Start up cpp an provide it with three lines of input:
* #define IMAKE_TEMPLATE " <template> "
* #define INCLUDE_IMAKEFILE < <imakefile> >
***************
*** 66,73
* 2. Determine the name of the template from the command line (-T)
* or the default, Imake.template. Call this <template>
* 3. Start up cpp an provide it with three lines of input:
! * #define IMAKE_TEMPLATE "<template>"
! * #define INCLUDE_IMAKEFILE "<imakefile>"
* #include IMAKE_TEMPLATE
* Note that the define for INCLUDE_IMAKEFILE is intended for
* use in the template file. This implies that the imake is
--- 77,84 -----
* 2. Determine the name of the template from the command line (-T)
* or the default, Imake.tmpl. Call this <template>
* 3. Start up cpp an provide it with three lines of input:
! * #define IMAKE_TEMPLATE " <template> "
! * #define INCLUDE_IMAKEFILE < <imakefile> >
* #include IMAKE_TEMPLATE
* Note that the define for INCLUDE_IMAKEFILE is intended for
* use in the template file. This implies that the imake is
***************
*** 88,94
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
- #include <sys/file.h>
#ifdef SYSV
#include <fcntl.h>
#else /* !SYSV */
--- 99,104 -----
#include <stdio.h>
#include <ctype.h>
#include <sys/types.h>
#ifdef SYSV
#ifndef macII /* mac will get the stuff out of file.h */
#include <fcntl.h>
***************
*** 90,95
#include <sys/types.h>
#include <sys/file.h>
#ifdef SYSV
#include <fcntl.h>
#else /* !SYSV */
#include <sys/wait.h>
--- 100,106 -----
#include <ctype.h>
#include <sys/types.h>
#ifdef SYSV
+ #ifndef macII /* mac will get the stuff out of file.h */
#include <fcntl.h>
#endif
#else /* !SYSV */
***************
*** 91,96
#include <sys/file.h>
#ifdef SYSV
#include <fcntl.h>
#else /* !SYSV */
#include <sys/wait.h>
#endif /* !SYSV */
--- 102,108 -----
#ifdef SYSV
#ifndef macII /* mac will get the stuff out of file.h */
#include <fcntl.h>
+ #endif
#else /* !SYSV */
#include <sys/wait.h>
#endif /* !SYSV */
***************
*** 94,100
#else /* !SYSV */
#include <sys/wait.h>
#endif /* !SYSV */
! #include <sys/signal.h>
#include <sys/stat.h>
#ifdef SYSV
--- 106,113 -----
#else /* !SYSV */
#include <sys/wait.h>
#endif /* !SYSV */
! #include <sys/file.h>
! #include <signal.h>
#include <sys/stat.h>
#include "imakemdep.h"
***************
*** 96,101
#endif /* !SYSV */
#include <sys/signal.h>
#include <sys/stat.h>
#ifdef SYSV
#define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : \
--- 109,115 -----
#include <sys/file.h>
#include <signal.h>
#include <sys/stat.h>
+ #include "imakemdep.h"
#define TRUE 1
***************
*** 97,106
#include <sys/signal.h>
#include <sys/stat.h>
! #ifdef SYSV
! #define dup2(fd1,fd2) ((fd1 == fd2) ? fd1 : \
! (close(fd2), fcntl(fd1, F_DUPFD, fd2)))
! #endif /* SYSV */
#define TRUE 1
#define FALSE 0
#define ARGUMENTS 50
--- 111,117 -----
#include <sys/stat.h>
#include "imakemdep.h"
!
#define TRUE 1
#define FALSE 0
***************
*** 103,109
#endif /* SYSV */
#define TRUE 1
#define FALSE 0
- #define ARGUMENTS 50
#if defined(sun) || defined(hpux)
#define REDUCED_TO_ASCII_SPACE
--- 114,119 -----
#define TRUE 1
#define FALSE 0
#ifdef FIXUP_CPP_WHITESPACE
int InRule = FALSE;
***************
*** 105,112
#define FALSE 0
#define ARGUMENTS 50
! #if defined(sun) || defined(hpux)
! #define REDUCED_TO_ASCII_SPACE
int InRule = FALSE;
#endif
--- 115,121 -----
#define TRUE 1
#define FALSE 0
! #ifdef FIXUP_CPP_WHITESPACE
int InRule = FALSE;
#endif
***************
*** 115,121
* space. In addition, the escaped newline may be replaced with a
* space instead of being deleted. Blech.
*/
! #ifndef REDUCED_TO_ASCII_SPACE
#define KludgeOutputLine(arg)
#define KludgeResetRule()
#endif
--- 124,130 -----
* space. In addition, the escaped newline may be replaced with a
* space instead of being deleted. Blech.
*/
! #ifndef FIXUP_CPP_WHITESPACE
#define KludgeOutputLine(arg)
#define KludgeResetRule()
#endif
***************
*** 120,126
#define KludgeResetRule()
#endif
! typedef u_char boolean;
#include <sys/param.h>
#if BSD > 43
--- 129,135 -----
#define KludgeResetRule()
#endif
! typedef unsigned char boolean;
#ifndef DEFAULT_CPP
#define DEFAULT_CPP "/lib/cpp"
***************
*** 122,135
typedef u_char boolean;
! #include <sys/param.h>
! #if BSD > 43
! char *cpp = "/usr/bin/cpp";
! #else
! #ifdef apollo
! char *cpp = "/usr/lib/cpp";
! #else
! char *cpp = "/lib/cpp";
#endif
#endif
--- 131,138 -----
typedef unsigned char boolean;
! #ifndef DEFAULT_CPP
! #define DEFAULT_CPP "/lib/cpp"
#endif
char *cpp = DEFAULT_CPP;
***************
*** 131,137
#else
char *cpp = "/lib/cpp";
#endif
- #endif
char *tmpMakefile = "/usr/tmp/tmp-make.XXXXXX";
char *tmpImakefile = "/usr/tmp/tmp-imake.XXXXXX";
--- 134,139 -----
#ifndef DEFAULT_CPP
#define DEFAULT_CPP "/lib/cpp"
#endif
char *cpp = DEFAULT_CPP;
***************
*** 133,140
#endif
#endif
! char *tmpMakefile = "/usr/tmp/tmp-make.XXXXXX";
! char *tmpImakefile = "/usr/tmp/tmp-imake.XXXXXX";
char *make_argv[ ARGUMENTS ] = { "make" };
char *cpp_argv[ ARGUMENTS ] = {
"cpp",
--- 135,144 -----
#define DEFAULT_CPP "/lib/cpp"
#endif
! char *cpp = DEFAULT_CPP;
!
! char *tmpMakefile = "/tmp/Imf.XXXXXX";
! char *tmpImakefile = "/tmp/IIf.XXXXXX";
char *make_argv[ ARGUMENTS ] = { "make" };
int make_argindex;
***************
*** 136,151
char *tmpMakefile = "/usr/tmp/tmp-make.XXXXXX";
char *tmpImakefile = "/usr/tmp/tmp-imake.XXXXXX";
char *make_argv[ ARGUMENTS ] = { "make" };
! char *cpp_argv[ ARGUMENTS ] = {
! "cpp",
! "-I.",
! #ifdef unix
! "-Uunix",
! #endif /* unix */
! #ifdef pegasus
! "-Dpegasus",
! #endif /* pegasus */
! };
int make_argindex;
int cpp_argindex;
char *make = NULL;
--- 140,146 -----
char *tmpMakefile = "/tmp/Imf.XXXXXX";
char *tmpImakefile = "/tmp/IIf.XXXXXX";
char *make_argv[ ARGUMENTS ] = { "make" };
!
int make_argindex;
int cpp_argindex;
char *make = NULL;
***************
*** 150,156
int cpp_argindex;
char *make = NULL;
char *Imakefile = NULL;
! char *Makefile = NULL;
char *Template = "Imake.template";
char *program;
char *FindImakefile();
--- 145,151 -----
int cpp_argindex;
char *make = NULL;
char *Imakefile = NULL;
! char *Makefile = "Makefile";
char *Template = "Imake.template";
char *program;
char *FindImakefile();
***************
*** 159,165
char *strdup();
boolean verbose = FALSE;
! boolean show = FALSE;
extern int errno;
extern char *Emalloc();
extern char *realloc();
--- 154,160 -----
char *strdup();
boolean verbose = FALSE;
! boolean show = TRUE;
extern int errno;
extern char *Emalloc();
extern char *realloc();
***************
*** 177,184
init();
SetOpts(argc, argv);
- AddCppArg("-I/usr/lib/local/imake.includes");
-
Imakefile = FindImakefile(Imakefile);
if (Makefile)
tmpMakefile = Makefile;
--- 172,177 -----
init();
SetOpts(argc, argv);
Imakefile = FindImakefile(Imakefile);
if (Makefile)
tmpMakefile = Makefile;
***************
*** 194,200
if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
LogFatal("Cannot create temporary file %s.", tmpMakefile);
! cppit(Imakefile, Template, tmpfd);
if (show) {
if (Makefile == NULL)
--- 187,193 -----
if ((tmpfd = fopen(tmpMakefile, "w+")) == NULL)
LogFatal("Cannot create temporary file %s.", tmpMakefile);
! cppit(Imakefile, Template, tmpfd, tmpMakefile);
if (show) {
if (Makefile == NULL)
***************
*** 225,230
unlink(tmpImakefile);
}
catch(sig)
int sig;
{
--- 218,228 -----
unlink(tmpImakefile);
}
+ #if SIGNALRETURNSINT
+ int
+ #else
+ void
+ #endif
catch(sig)
int sig;
{
***************
*** 320,326
}
} else if (argv[0][1] == 's') {
if (argv[0][2])
! Makefile = argv[0]+2;
else if (argc > 1 && argv[1][0] != '-') {
argc--, argv++;
Makefile = argv[0];
--- 318,324 -----
}
} else if (argv[0][1] == 's') {
if (argv[0][2])
! Makefile = (argv[0][2] == '-') ? NULL : argv[0]+2;
else if (argc > 1 && argv[1][0] != '-') {
argc--, argv++;
Makefile = argv[0];
***************
*** 326,331
Makefile = argv[0];
}
show = TRUE;
} else if (argv[0][1] == 'T') {
if (argv[0][2])
Template = argv[0]+2;
--- 324,332 -----
Makefile = argv[0];
}
show = TRUE;
+ } else if (argv[0][1] == 'e') {
+ Makefile = (argv[0][2] ? argv[0]+2 : NULL);
+ show = FALSE;
} else if (argv[0][1] == 'T') {
if (argv[0][2])
Template = argv[0]+2;
***************
*** 400,406
fprintf(stderr, "\n");
}
! cppit(Imakefile, template, outfd)
char *Imakefile;
char *template;
FILE *outfd;
--- 401,407 -----
fprintf(stderr, "\n");
}
! cppit(Imakefile, template, outfd, outfname)
char *Imakefile;
char *template;
FILE *outfd;
***************
*** 404,409
char *Imakefile;
char *template;
FILE *outfd;
{
FILE *pipeFile;
int pid, pipefd[2];
--- 405,411 -----
char *Imakefile;
char *template;
FILE *outfd;
+ char *outfname;
{
FILE *pipeFile;
int pid, pipefd[2];
***************
*** 423,429
/*
* Fork and exec cpp
*/
! pid = vfork();
if (pid < 0)
LogFatal("Cannot fork.", "");
if (pid) { /* parent */
--- 425,431 -----
/*
* Fork and exec cpp
*/
! pid = fork();
if (pid < 0)
LogFatal("Cannot fork.", "");
if (pid) { /* parent */
***************
*** 433,439
LogFatalI("Cannot fdopen fd %d for output.", pipefd[1]);
fprintf(pipeFile, "#define IMAKE_TEMPLATE\t\"%s\"\n",
template);
! fprintf(pipeFile, "#define INCLUDE_IMAKEFILE\t\"%s\"\n",
cleanedImakefile);
fprintf(pipeFile, "#include IMAKE_TEMPLATE\n");
fclose(pipeFile);
--- 435,441 -----
LogFatalI("Cannot fdopen fd %d for output.", pipefd[1]);
fprintf(pipeFile, "#define IMAKE_TEMPLATE\t\"%s\"\n",
template);
! fprintf(pipeFile, "#define INCLUDE_IMAKEFILE\t<%s>\n",
cleanedImakefile);
fprintf(pipeFile, "#include IMAKE_TEMPLATE\n");
fclose(pipeFile);
***************
*** 451,457
LogFatalI("Exit code %d.", status.w_retcode);
#endif /* !SYSV */
}
! CleanCppOutput(outfd);
} else { /* child... dup and exec cpp */
if (verbose)
showargs(cpp_argv);
--- 453,459 -----
LogFatalI("Exit code %d.", status.w_retcode);
#endif /* !SYSV */
}
! CleanCppOutput(outfd, outfname);
} else { /* child... dup and exec cpp */
if (verbose)
showargs(cpp_argv);
***************
*** 475,481
/*
* Fork and exec make
*/
! pid = vfork();
if (pid < 0)
LogFatal("Cannot fork.", "");
if (pid) { /* parent... simply wait */
--- 477,483 -----
/*
* Fork and exec make
*/
! pid = fork();
if (pid < 0)
LogFatal("Cannot fork.", "");
if (pid) { /* parent... simply wait */
***************
*** 575,581
return(cleanedImakefile);
}
! CleanCppOutput(tmpfd)
FILE *tmpfd;
{
char *input;
--- 577,583 -----
return(cleanedImakefile);
}
! CleanCppOutput(tmpfd, tmpfname)
FILE *tmpfd;
char *tmpfname;
{
***************
*** 577,582
CleanCppOutput(tmpfd)
FILE *tmpfd;
{
char *input;
int blankline = 0;
--- 579,585 -----
CleanCppOutput(tmpfd, tmpfname)
FILE *tmpfd;
+ char *tmpfname;
{
char *input;
int blankline = 0;
***************
*** 581,587
char *input;
int blankline = 0;
! while(input = ReadLine(tmpfd)) {
if (isempty(input)) {
if (blankline++)
continue;
--- 584,590 -----
char *input;
int blankline = 0;
! while(input = ReadLine(tmpfd, tmpfname)) {
if (isempty(input)) {
if (blankline++)
continue;
***************
*** 594,599
putc('\n', tmpfd);
}
fflush(tmpfd);
}
/*
--- 597,610 -----
putc('\n', tmpfd);
}
fflush(tmpfd);
+ #ifdef NFS_STDOUT_BUG
+ /*
+ * On some systems, NFS seems to leave a large number of nulls at
+ * the end of the file. Ralph Swick says that this kludge makes the
+ * problem go away.
+ */
+ ftruncate (fileno(tmpfd), (off_t)ftell(tmpfd));
+ #endif
}
/*
***************
*** 637,643
return (*line == '\0');
}
! char *ReadLine(tmpfd)
FILE *tmpfd;
{
static boolean initialized = FALSE;
--- 648,655 -----
return (*line == '\0');
}
! /*ARGSUSED*/
! char *ReadLine(tmpfd, tmpfname)
FILE *tmpfd;
char *tmpfname;
{
***************
*** 639,644
char *ReadLine(tmpfd)
FILE *tmpfd;
{
static boolean initialized = FALSE;
static char *buf, *pline, *end;
--- 651,657 -----
/*ARGSUSED*/
char *ReadLine(tmpfd, tmpfname)
FILE *tmpfd;
+ char *tmpfname;
{
static boolean initialized = FALSE;
static char *buf, *pline, *end;
***************
*** 660,665
end = buf + st.st_size;
*end = '\0';
lseek(fileno(tmpfd), 0, 0);
ftruncate(fileno(tmpfd), 0);
initialized = TRUE;
#ifdef REDUCED_TO_ASCII_SPACE
--- 673,681 -----
end = buf + st.st_size;
*end = '\0';
lseek(fileno(tmpfd), 0, 0);
+ #ifdef SYSV
+ freopen(tmpfname, "w+", tmpfd);
+ #else /* !SYSV */
ftruncate(fileno(tmpfd), 0);
#endif /* !SYSV */
initialized = TRUE;
***************
*** 661,666
*end = '\0';
lseek(fileno(tmpfd), 0, 0);
ftruncate(fileno(tmpfd), 0);
initialized = TRUE;
#ifdef REDUCED_TO_ASCII_SPACE
fprintf(tmpfd, "#\n");
--- 677,683 -----
freopen(tmpfname, "w+", tmpfd);
#else /* !SYSV */
ftruncate(fileno(tmpfd), 0);
+ #endif /* !SYSV */
initialized = TRUE;
fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
fprintf (tmpfd, "# %s\n",
***************
*** 662,676
lseek(fileno(tmpfd), 0, 0);
ftruncate(fileno(tmpfd), 0);
initialized = TRUE;
! #ifdef REDUCED_TO_ASCII_SPACE
! fprintf(tmpfd, "#\n");
! fprintf(tmpfd, "# Warning: the cpp used on this machine replaces\n");
! fprintf(tmpfd, "# all newlines and multiple tabs/spaces in a macro\n");
! fprintf(tmpfd, "# expansion with a single space. Imake tries to\n");
! fprintf(tmpfd, "# compensate for this, but is not always\n");
! fprintf(tmpfd, "# successful.\n");
! fprintf(tmpfd, "#\n");
! #endif /* REDUCED_TO_ASCII_SPACE */
}
for (p1 = pline; p1 < end; p1++) {
--- 679,704 -----
ftruncate(fileno(tmpfd), 0);
#endif /* !SYSV */
initialized = TRUE;
! fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n");
! fprintf (tmpfd, "# %s\n",
! "$XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $");
!
! #ifdef FIXUP_CPP_WHITESPACE
! {
! static char *cpp_warning[] = {
! "#",
! "# The cpp used on this machine replaces all newlines and multiple tabs and",
! "# spaces in a macro expansion with a single space. Imake tries to compensate",
! "# for this, but is not always successful.",
! "#",
! NULL };
! char **cpp;
!
! for (cpp = cpp_warning; *cpp; cpp++) {
! fprintf (tmpfd, "%s\n", *cpp);
! }
! }
! #endif /* FIXUP_CPP_WHITESPACE */
}
for (p1 = pline; p1 < end; p1++) {
***************
*** 713,719
return(p);
}
! #ifdef REDUCED_TO_ASCII_SPACE
KludgeOutputLine(pline)
char **pline;
{
--- 741,747 -----
return(p);
}
! #ifdef FIXUP_CPP_WHITESPACE
KludgeOutputLine(pline)
char **pline;
{
***************
*** 726,732
break;
case ' ': /*May need a tab*/
default:
! while (*p) if (*p++ == ':') {
if (**pline == ' ')
(*pline)++;
InRule = TRUE;
--- 754,761 -----
break;
case ' ': /*May need a tab*/
default:
! for (; *p; p++) if (p[0] == ':' &&
! p > *pline && p[-1] != '\\') {
if (**pline == ' ')
(*pline)++;
InRule = TRUE;
***************
*** 742,748
{
InRule = FALSE;
}
! #endif /* REDUCED_TO_ASCII_SPACE */
char *strdup(cp)
register char *cp;
--- 771,777 -----
{
InRule = FALSE;
}
! #endif /* FIXUP_CPP_WHITESPACE */
char *strdup(cp)
register char *cp;
Only in kerberos/util/imake: imake.man
Only in kerberos/util/imake: imakemdep.h
Only in kerberos/util/imake: macII.cf
Only in kerberos/util/imake: site.def
diff -rc /source/athena/athena.lib/kerberos/util/imake.includes/config.Imakefile kerberos/util/imake.includes/config.Imakefile
*** /source/athena/athena.lib/kerberos/util/imake.includes/config.Imakefile Tue Apr 24 17:14:57 1990
--- kerberos/util/imake.includes/config.Imakefile Sat Jun 9 03:22:29 1990
***************
*** 33,39
* (check <sys/types.h>)
*/
! GLOBAL_CDEFS= -DBSD42 -DATHENA_COMPAT -DATHENA -DKERBEROS -DVFS \
$(NOENCFLAG) $(DBMFLAG) $(SHMFLAG)
/* SRCTOP is the root of the Kerberos source tree */
--- 33,39 -----
* (check <sys/types.h>)
*/
! GLOBAL_CDEFS= -DATHENA_COMPAT -DmacII -DBSD42 -Dmc68000 -DSYSV -DPOSIX -DNOTTYENT -DATHENA -DKERBEROS -DVFS \
$(NOENCFLAG) $(DBMFLAG) $(SHMFLAG)
/* SRCTOP is the root of the Kerberos source tree */
***************
*** 37,43
$(NOENCFLAG) $(DBMFLAG) $(SHMFLAG)
/* SRCTOP is the root of the Kerberos source tree */
! SRCTOP=/mit/kerberos/src
/* DESTDIR is the root of the tree to install into.
* If null, install into the running system.
--- 37,43 -----
$(NOENCFLAG) $(DBMFLAG) $(SHMFLAG)
/* SRCTOP is the root of the Kerberos source tree */
! SRCTOP=/mit/new/src
/* DESTDIR is the root of the tree to install into.
* If null, install into the running system.
***************
*** 90,96
* Define NDBM if you are using the 4.3 ndbm library (which is part of
* libc). If not defined, 4.2 dbm will be assumed.
*/
! #define NDBM
/*
* Define NEED_SETENV if you don't have setenv() in your libc.
--- 90,96 -----
* Define NDBM if you are using the 4.3 ndbm library (which is part of
* libc). If not defined, 4.2 dbm will be assumed.
*/
! /* #define NDBM */
/*
* Define NEED_SETENV if you don't have setenv() in your libc.
***************
*** 169,174
*/
COM_ERR_DEP = $(COM_ERR)
/*
* The name of a command which compiles command tables.
*/
MAKE_COMMANDS= $(BUILDTOP)/util/ss/make_commands
--- 169,178 -----
*/
COM_ERR_DEP = $(COM_ERR)
/*
+ * Makedpend
+ */
+ DEPEND = $(BUILDTOP)/util/makedepend/makedepend
+ /*
* The name of a command which compiles command tables.
*/
MAKE_COMMANDS= $(BUILDTOP)/util/ss/make_commands
***************
*** 175,181
/*
* Loader argument to get the ss library
*/
! SS_LIB = $(BUILDTOP)/util/ss/libss.a
/*
* Dependency name for SS_LIB, if any
*/
--- 179,185 -----
/*
* Loader argument to get the ss library
*/
! SS_LIB = $(BUILDTOP)/util/ss/lib/libss.a
/*
* Dependency name for SS_LIB, if any
*/
***************
*** 203,209
* Define PROFILED_LIBS if you want to create profiled versions of the
* libraries used in Kerberos
*/
! #define PROFILED_LIBS
/*
* Define PROF_FLAG to be the flag to be passed to your C compiler to
--- 207,213 -----
* Define PROFILED_LIBS if you want to create profiled versions of the
* libraries used in Kerberos
*/
! /* #define PROFILED_LIBS */
/*
* Define PROF_FLAG to be the flag to be passed to your C compiler to
***************
*** 210,216
* turn on profiling. For 4.3BSD on a VAX, this should probably be -pg.
* For most other systems, it should probably be -p
*/
! #define PROF_FLAG -p
/*
* The name of a command which builds an object library.
--- 214,220 -----
* turn on profiling. For 4.3BSD on a VAX, this should probably be -pg.
* For most other systems, it should probably be -p
*/
! /* #define PROF_FLAG */
/*
* The name of a command which builds an object library.
***************
*** 219,225
/*
* The name of another program needed to post-process the archive.
*/
! RANLIB= ranlib
--- 223,229 -----
/*
* The name of another program needed to post-process the archive.
*/
! RANLIB=echo
***************
*** 243,249
AS=as /* The name of the target's assembler */
! LINT=lint /* The name of `lint' */
CC=cc /* The name of the C compiler for the target */
--- 247,253 -----
AS=as /* The name of the target's assembler */
! LINT=echo /* The name of `lint' */
CC=gcc -traditional -fpcc-struct-return -fwritable-strings -D_SYSV_SOURCE -D_BSD_SOURCE -D_AUX_SOURCE -DNOSTDHDRS
***************
*** 245,251
LINT=lint /* The name of `lint' */
! CC=cc /* The name of the C compiler for the target */
CCRO=cc -R /* Compile with initialized data read-only
& shared (if possible) */
--- 249,255 -----
LINT=echo /* The name of `lint' */
! CC=gcc -traditional -fpcc-struct-return -fwritable-strings -D_SYSV_SOURCE -D_BSD_SOURCE -D_AUX_SOURCE -DNOSTDHDRS
CCRO=gcc -R /* Compile with initialized data read-only
& shared (if possible) */
***************
*** 247,253
CC=cc /* The name of the C compiler for the target */
! CCRO=cc -R /* Compile with initialized data read-only
& shared (if possible) */
HCC=$(CC) /* The name of the C compiler on _this_
--- 251,257 -----
CC=gcc -traditional -fpcc-struct-return -fwritable-strings -D_SYSV_SOURCE -D_BSD_SOURCE -D_AUX_SOURCE -DNOSTDHDRS
! CCRO=gcc -R /* Compile with initialized data read-only
& shared (if possible) */
HCC=$(CC) /* The name of the C compiler on _this_
***************
*** 256,262
CPP=$(CC) -E /* A command which invokes the C preprocessor */
! DBG=-O /* Debug or optimize? */
HCFLAGS=$(CFLAGS)
--- 260,266 -----
CPP=$(CC) -E /* A command which invokes the C preprocessor */
! DBG=-O -fstrength-reduce /* Debug or optimize? */
HCFLAGS=$(CFLAGS)
***************
*** 270,282
LPR=lpr -p /* print a file or files */
CHMOD=chmod /* change mode of a file */
! /* turds */
! /* XXX default's uid on Athena (for tftp) */
! DEF_UID = 113
!
! #ifdef vax /*XXX*/
! #if 0
! #define VAXASM
! #endif
! #define BIG
! #endif
--- 274,277 -----
LPR=lpr -p /* print a file or files */
CHMOD=chmod /* change mode of a file */
! #define AUX_ASM
diff -rc /source/athena/athena.lib/kerberos/util/ss/Makefile kerberos/util/ss/Makefile
*** /source/athena/athena.lib/kerberos/util/ss/Makefile Tue Apr 11 10:52:11 1989
--- kerberos/util/ss/Makefile Sun Jun 10 00:35:19 1990
***************
*** 10,16
DESTDIR=
# flags
! CFLAGS= -g -I../et
LINTFLAGS= -uhv -I../et
--- 10,16 -----
DESTDIR=
# flags
! CFLAGS= -g -DmacII -I../et
LINTFLAGS= -uhv -I../et
***************
*** 97,103
#
libss.a: $(OBJS)
ar cruv libss.a $(OBJS)
! ranlib libss.a
libss.o: $(OBJS)
ld -r -s -o libss.o $(OBJS)
--- 97,103 -----
#
libss.a: $(OBJS)
ar cruv libss.a $(OBJS)
! # ranlib libss.a
libss.o: $(OBJS)
ld -r -s -o libss.o $(OBJS)
***************
*** 164,203
# the last constant line in the makefile should be...
# DO NOT DELETE THIS LINE
! invocation.o: invocation.c ss_internal.h /usr/include/stdio.h
! invocation.o: /usr/include/strings.h ss.h ../et/mit-sipb-copyright.h
! help.o: help.c /usr/include/sys/param.h /usr/include/machine/machparam.h
! help.o: /usr/include/signal.h /usr/include/sys/types.h /usr/include/sys/file.h
! help.o: /usr/include/sys/wait.h ss_internal.h /usr/include/stdio.h
! help.o: /usr/include/strings.h ss.h ../et/mit-sipb-copyright.h
! help.o: /usr/include/sys/types.h /usr/include/sys/dir.h
! execute_cmd.o: execute_cmd.c ss_internal.h /usr/include/stdio.h
! execute_cmd.o: /usr/include/strings.h ss.h ../et/mit-sipb-copyright.h
! listen.o: listen.c ../et/mit-sipb-copyright.h ss_internal.h
! listen.o: /usr/include/stdio.h /usr/include/strings.h ss.h
! listen.o: /usr/include/signal.h
! ss_perror.o: ss_perror.c ../et/mit-sipb-copyright.h ss_internal.h
! ss_perror.o: /usr/include/stdio.h /usr/include/strings.h ss.h
! prompt.o: prompt.c ../et/mit-sipb-copyright.h /usr/include/stdio.h
! prompt.o: ss_internal.h /usr/include/stdio.h /usr/include/strings.h ss.h
! request_tbl.o: request_tbl.c ../et/mit-sipb-copyright.h ss_internal.h
! request_tbl.o: /usr/include/stdio.h /usr/include/strings.h ss.h
! list_requests.o: list_requests.c ../et/mit-sipb-copyright.h ss_internal.h
! list_requests.o: /usr/include/stdio.h /usr/include/strings.h ss.h
! list_requests.o: /usr/include/sys/wait.h
! pager.o: pager.c ../et/mit-sipb-copyright.h /usr/include/stdio.h
! requests.o: requests.c ../et/mit-sipb-copyright.h /usr/include/stdio.h
! requests.o: ss_internal.h /usr/include/stdio.h /usr/include/strings.h ss.h
! data.o: data.c /usr/include/stdio.h ss_internal.h /usr/include/stdio.h
! data.o: /usr/include/strings.h ss.h ../et/mit-sipb-copyright.h
! make_commands.o: make_commands.c ../et/mit-sipb-copyright.h
! make_commands.o: /usr/include/stdio.h /usr/include/sys/file.h
! make_commands.o: /usr/include/strings.h ss.h
! mkcmds_utils.o: mkcmds_utils.c ../et/mit-sipb-copyright.h /usr/include/stdio.h
! mkcmds_utils.o: ss.h
! string_utils.o: string_utils.c ../et/mit-sipb-copyright.h
! string_utils.o: /usr/include/strings.h
! options.o: options.c ../et/mit-sipb-copyright.h /usr/include/stdio.h ss.h
! ct.o: ct.c /usr/include/stdio.h ../et/mit-sipb-copyright.h ss.h
! cmd_tbl.lex.o: cmd_tbl.lex.c /usr/include/stdio.h /usr/include/string.h
! cmd_tbl.lex.o: /usr/include/strings.h ct.h ../et/mit-sipb-copyright.h
--- 164,203 -----
# the last constant line in the makefile should be...
# DO NOT DELETE THIS LINE
! invocation.o: ss_internal.h /usr/include/stdio.h /usr/include/strings.h
! invocation.o: /usr/include/string.h ss.h mit-sipb-copyright.h
! help.o: /usr/include/sys/param.h /usr/include/apple_notice.h
! help.o: /usr/include/sys/signal.h /usr/include/sys/types.h
! help.o: /usr/include/sys/file.h /usr/include/sys/wait.h ss_internal.h
! help.o: /usr/include/stdio.h /usr/include/strings.h /usr/include/string.h
! help.o: ss.h mit-sipb-copyright.h /usr/include/sys/dir.h
! execute_cmd.o: ss_internal.h /usr/include/stdio.h /usr/include/strings.h
! execute_cmd.o: /usr/include/string.h ss.h mit-sipb-copyright.h
! listen.o: mit-sipb-copyright.h ss_internal.h /usr/include/stdio.h
! listen.o: /usr/include/strings.h /usr/include/string.h ss.h
! listen.o: /usr/include/sys/signal.h /usr/include/apple_notice.h
! ss_perror.o: mit-sipb-copyright.h ss_internal.h /usr/include/stdio.h
! ss_perror.o: /usr/include/strings.h /usr/include/string.h ss.h
! prompt.o: mit-sipb-copyright.h /usr/include/stdio.h ss_internal.h
! prompt.o: /usr/include/strings.h /usr/include/string.h ss.h
! request_tbl.o: mit-sipb-copyright.h ss_internal.h /usr/include/stdio.h
! request_tbl.o: /usr/include/strings.h /usr/include/string.h ss.h
! list_requests.o: mit-sipb-copyright.h ss_internal.h /usr/include/stdio.h
! list_requests.o: /usr/include/strings.h /usr/include/string.h ss.h
! list_requests.o: /usr/include/sys/wait.h /usr/include/apple_notice.h
! pager.o: mit-sipb-copyright.h /usr/include/stdio.h
! requests.o: mit-sipb-copyright.h /usr/include/stdio.h ss_internal.h
! requests.o: /usr/include/strings.h /usr/include/string.h ss.h
! data.o: /usr/include/stdio.h ss_internal.h /usr/include/strings.h
! data.o: /usr/include/string.h ss.h mit-sipb-copyright.h
! make_commands.o: mit-sipb-copyright.h /usr/include/stdio.h
! make_commands.o: /usr/include/sys/types.h /usr/include/apple_notice.h
! make_commands.o: /usr/include/sys/file.h /usr/include/strings.h
! make_commands.o: /usr/include/string.h ss.h
! mkcmds_utils.o: mit-sipb-copyright.h /usr/include/stdio.h ss.h
! string_utils.o: mit-sipb-copyright.h /usr/include/strings.h
! string_utils.o: /usr/include/string.h
! options.o: mit-sipb-copyright.h /usr/include/stdio.h ss.h
! ct.o: /usr/include/stdio.h mit-sipb-copyright.h ss.h
! cmd_tbl.lex.o: /usr/include/stdio.h /usr/include/string.h ct.h
! cmd_tbl.lex.o: mit-sipb-copyright.h
Only in kerberos/util/ss: Makefile.bak
Only in /source/athena/athena.lib/kerberos/util/ss: RCS
Only in kerberos/util/ss: cmd_tbl.lex.c
Only in kerberos/util/ss: cmd_tbl.lex.o
Only in kerberos/util/ss: ct.c
Only in kerberos/util/ss: ct.o
Only in kerberos/util/ss: data.o
Only in kerberos/util/ss: execute_cmd.o
diff -rc /source/athena/athena.lib/kerberos/util/ss/help.c kerberos/util/ss/help.c
*** /source/athena/athena.lib/kerberos/util/ss/help.c Thu Jul 2 14:18:16 1987
--- kerberos/util/ss/help.c Sat Jun 9 03:33:14 1990
***************
*** 4,9
* For copyright info, see mit-sipb-copyright.h.
*/
#include <sys/param.h>
#include <sys/file.h>
#include <sys/wait.h>
#include "ss_internal.h"
--- 4,12 -----
* For copyright info, see mit-sipb-copyright.h.
*/
#include <sys/param.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include <sys/wait.h>
#include "ss_internal.h"
Only in kerberos/util/ss: help.o
Only in kerberos/util/ss: invocation.o
Only in kerberos/util/ss: lib
Only in kerberos/util/ss: libss.a
Only in kerberos/util/ss: list_requests.o
diff -rc /source/athena/athena.lib/kerberos/util/ss/listen.c kerberos/util/ss/listen.c
*** /source/athena/athena.lib/kerberos/util/ss/listen.c Thu Jul 2 14:18:17 1987
--- kerberos/util/ss/listen.c Sat Jun 9 03:36:24 1990
***************
*** 16,21
static char rcs_id[] = "$Header: listen.c,v 1.4 87/01/21 07:34:06 spook Exp $";
#endif
extern char *index();
static ss_data *current_info;
--- 16,25 -----
static char rcs_id[] = "$Header: listen.c,v 1.4 87/01/21 07:34:06 spook Exp $";
#endif
+ #ifdef macII
+ #undef index
+ #endif
+
extern char *index();
static ss_data *current_info;
Only in kerberos/util/ss: listen.o
Only in kerberos/util/ss: make_commands
diff -rc /source/athena/athena.lib/kerberos/util/ss/make_commands.c kerberos/util/ss/make_commands.c
*** /source/athena/athena.lib/kerberos/util/ss/make_commands.c Thu Jul 2 14:18:22 1987
--- kerberos/util/ss/make_commands.c Sat Jun 9 03:19:10 1990
***************
*** 10,15
*/
#include "mit-sipb-copyright.h"
#include <stdio.h>
#include <sys/file.h>
#include <strings.h>
#include "ss.h"
--- 10,18 -----
*/
#include "mit-sipb-copyright.h"
#include <stdio.h>
+ #ifdef macII
+ #include <sys/types.h>
+ #endif
#include <sys/file.h>
#include <strings.h>
#include "ss.h"
***************
*** 13,18
#include <sys/file.h>
#include <strings.h>
#include "ss.h"
static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
--- 16,25 -----
#include <sys/file.h>
#include <strings.h>
#include "ss.h"
+
+ #ifdef macII
+ #define vfork fork
+ #endif
static char copyright[] = "Copyright 1987 by MIT Student Information Processing Board";
Only in kerberos/util/ss: make_commands.o
Only in kerberos/util/ss: mkcmds_utils.o
Only in kerberos/util/ss: options.o
Only in kerberos/util/ss: pager.o
Only in kerberos/util/ss: prompt.o
Only in kerberos/util/ss: request_tbl.o
Only in kerberos/util/ss: requests.o
Only in kerberos/util/ss: ss.h
Only in kerberos/util/ss: ss_err.h
Only in kerberos/util/ss: ss_err.o
Only in kerberos/util/ss: ss_perror.o
Only in kerberos/util/ss: std_requests.o
Only in kerberos/util/ss: string_utils.o
