From 0613ac5365b27e433f3607aed769a473b9580844 Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Fri, 28 Apr 1995 17:11:06 +0000 Subject: [PATCH] conf.h, conf-*.h: Removed. We don't need them anymore, we're using autoconf! (And things like MSBFIRST AND LSBFIRST aren't needed anyway, since the CNS V4 library figures this all out dynamically anyway.) krb4-proto.h: Don't define the functions found in getenv.o or setenv.o. Declare krb_stime() instead of stime(). git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5609 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/kerberosIV/ChangeLog | 10 +++ src/include/kerberosIV/conf-bsd386i.h | 30 --------- src/include/kerberosIV/conf-bsdapollo.h | 35 ---------- src/include/kerberosIV/conf-bsdibm032.h | 32 --------- src/include/kerberosIV/conf-bsdm68k.h | 30 --------- src/include/kerberosIV/conf-bsdsparc.h | 31 --------- src/include/kerberosIV/conf-bsdtahoe.h | 31 --------- src/include/kerberosIV/conf-bsdvax.h | 36 ---------- src/include/kerberosIV/conf-ibm370.h | 29 -------- src/include/kerberosIV/conf-osf1alpha.h | 28 -------- src/include/kerberosIV/conf-pc.h | 29 -------- src/include/kerberosIV/conf-pyr.h | 29 -------- src/include/kerberosIV/conf-ultmips2.h | 31 --------- src/include/kerberosIV/conf.h | 88 ------------------------- src/include/kerberosIV/krb4-proto.h | 6 +- 15 files changed, 15 insertions(+), 460 deletions(-) delete mode 100644 src/include/kerberosIV/conf-bsd386i.h delete mode 100644 src/include/kerberosIV/conf-bsdapollo.h delete mode 100644 src/include/kerberosIV/conf-bsdibm032.h delete mode 100644 src/include/kerberosIV/conf-bsdm68k.h delete mode 100644 src/include/kerberosIV/conf-bsdsparc.h delete mode 100644 src/include/kerberosIV/conf-bsdtahoe.h delete mode 100644 src/include/kerberosIV/conf-bsdvax.h delete mode 100644 src/include/kerberosIV/conf-ibm370.h delete mode 100644 src/include/kerberosIV/conf-osf1alpha.h delete mode 100644 src/include/kerberosIV/conf-pc.h delete mode 100644 src/include/kerberosIV/conf-pyr.h delete mode 100644 src/include/kerberosIV/conf-ultmips2.h delete mode 100644 src/include/kerberosIV/conf.h diff --git a/src/include/kerberosIV/ChangeLog b/src/include/kerberosIV/ChangeLog index bf9a0de5c..8d4ccc9db 100644 --- a/src/include/kerberosIV/ChangeLog +++ b/src/include/kerberosIV/ChangeLog @@ -1,3 +1,13 @@ +Fri Apr 28 08:24:23 1995 Theodore Y. Ts'o + + * conf.h, conf-*.h: Removed. We don't need them anymore, + we're using autoconf! (And things like MSBFIRST AND + LSBFIRST aren't needed anyway, since the CNS V4 + library figures this all out dynamically anyway.) + + * krb4-proto.h: Don't define the functions found in getenv.o or + setenv.o. Declare krb_stime() instead of stime(). + Thu Apr 27 17:12:30 1995 Mark Eichin * krb.h: add _fmemcpy, _fstrncpy, and far_fputs from cc-unix.h also. diff --git a/src/include/kerberosIV/conf-bsd386i.h b/src/include/kerberosIV/conf-bsd386i.h deleted file mode 100644 index 705980cc1..000000000 --- a/src/include/kerberosIV/conf-bsd386i.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * include/kerberosIV/conf-bsd386i.h - * - * Copyright 1989-1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: Sun 386i using SunOS (~BSD) - */ - -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX - diff --git a/src/include/kerberosIV/conf-bsdapollo.h b/src/include/kerberosIV/conf-bsdapollo.h deleted file mode 100644 index e4ff4a589..000000000 --- a/src/include/kerberosIV/conf-bsdapollo.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * include/kerberosIV/conf-bsdapollo.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#define BSDUNIX -#define BITS32 -#define BIG -#define MSBFIRST -#define DES_SHIFT_SHIFT -/* - * As of SR10, the C compiler claims to be __STDC__, but doesn't support - * const. Sigh. - */ -#define const - - diff --git a/src/include/kerberosIV/conf-bsdibm032.h b/src/include/kerberosIV/conf-bsdibm032.h deleted file mode 100644 index 179201477..000000000 --- a/src/include/kerberosIV/conf-bsdibm032.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * include/kerberosIV/conf-bsdibm032.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: IBM 032 (RT/PC) - */ - -#define BSDUNIX -#define IBMWS -#define IBMWSASM -#define BITS32 -#define BIG -#define MSBFIRST -#define MUSTALIGN diff --git a/src/include/kerberosIV/conf-bsdm68k.h b/src/include/kerberosIV/conf-bsdm68k.h deleted file mode 100644 index 8990a9857..000000000 --- a/src/include/kerberosIV/conf-bsdm68k.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * include/kerberosIV/conf-bsdm68k.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: 68000 with BSD Unix, e.g. SUN - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX - diff --git a/src/include/kerberosIV/conf-bsdsparc.h b/src/include/kerberosIV/conf-bsdsparc.h deleted file mode 100644 index 87945a681..000000000 --- a/src/include/kerberosIV/conf-bsdsparc.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * include/kerberosIV/conf-bsdsparc.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: SPARC with BSD Unix, e.g. SUN-4 - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX -#define MUSTALIGN - diff --git a/src/include/kerberosIV/conf-bsdtahoe.h b/src/include/kerberosIV/conf-bsdtahoe.h deleted file mode 100644 index de613ede3..000000000 --- a/src/include/kerberosIV/conf-bsdtahoe.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * include/kerberosIV/conf-bsdtahoe.h - * - * Copyright 1989, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - */ - -#define TAHOE -#define BSDUNIX -#define BITS32 -#define BIG -#define MSBFIRST -#define MUSTALIGN -#define NOASM diff --git a/src/include/kerberosIV/conf-bsdvax.h b/src/include/kerberosIV/conf-bsdvax.h deleted file mode 100644 index 64ebb8d49..000000000 --- a/src/include/kerberosIV/conf-bsdvax.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * include/kerberosIV/conf-bsdvax.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: VAX - */ - -#define VAX -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX - -#ifndef __STDC__ -#ifndef NOASM -#define VAXASM -#endif /* no assembly */ -#endif /* standard C */ diff --git a/src/include/kerberosIV/conf-ibm370.h b/src/include/kerberosIV/conf-ibm370.h deleted file mode 100644 index 6fe04e2d5..000000000 --- a/src/include/kerberosIV/conf-ibm370.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * include/kerberosIV/conf-ibm370.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: IBM 370 - */ - -/* What else? */ -#define BIG -#define NONASCII -#define SHORTNAMES diff --git a/src/include/kerberosIV/conf-osf1alpha.h b/src/include/kerberosIV/conf-osf1alpha.h deleted file mode 100644 index 27eadeb90..000000000 --- a/src/include/kerberosIV/conf-osf1alpha.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * include/kerberosIV/conf-osf1alpha.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - */ - -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX -#define MUSTALIGN diff --git a/src/include/kerberosIV/conf-pc.h b/src/include/kerberosIV/conf-pc.h deleted file mode 100644 index 838b763a1..000000000 --- a/src/include/kerberosIV/conf-pc.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * include/kerberosIV/conf-pc.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: IBM PC 8086 - */ - -#define IBMPC -#define BITS16 -#define CROSSMSDOS -#define LSBFIRST diff --git a/src/include/kerberosIV/conf-pyr.h b/src/include/kerberosIV/conf-pyr.h deleted file mode 100644 index f82f232c4..000000000 --- a/src/include/kerberosIV/conf-pyr.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * include/kerberosIV/conf-pyr.h - * - * Copyright 1989, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: Pyramid - */ - -#define BITS32 -#define BIG -#define MSBFIRST -#define BSDUNIX diff --git a/src/include/kerberosIV/conf-ultmips2.h b/src/include/kerberosIV/conf-ultmips2.h deleted file mode 100644 index 3dd09ee2c..000000000 --- a/src/include/kerberosIV/conf-ultmips2.h +++ /dev/null @@ -1,31 +0,0 @@ -/* - * include/kerberosIV/conf-ultmips2.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Machine-type definitions: DECstation 3100 (MIPS R2000) - */ - -#define MIPS2 -#define BITS32 -#define BIG -#define LSBFIRST -#define BSDUNIX -#define MUSTALIGN diff --git a/src/include/kerberosIV/conf.h b/src/include/kerberosIV/conf.h deleted file mode 100644 index f7e2e31ca..000000000 --- a/src/include/kerberosIV/conf.h +++ /dev/null @@ -1,88 +0,0 @@ -/* - * include/kerberosIV/conf.h - * - * Copyright 1988, 1994 by the Massachusetts Institute of Technology. - * All Rights Reserved. - * - * Export of this software from the United States of America may - * require a specific license from the United States Government. - * It is the responsibility of any person or organization contemplating - * export to obtain such a license before exporting. - * - * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and - * distribute this software and its documentation for any purpose and - * without fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright notice and - * this permission notice appear in supporting documentation, and that - * the name of M.I.T. not be used in advertising or publicity pertaining - * to distribution of the software without specific, written prior - * permission. M.I.T. makes no representations about the suitability of - * this software for any purpose. It is provided "as is" without express - * or implied warranty. - * - * Configuration info for operating system, hardware description, - * language implementation, C library, etc. - * - * This file should be included in (almost) every file in the Kerberos - * sources, and probably should *not* be needed outside of those - * sources. (How do we deal with /usr/include/des.h and - * /usr/include/krb.h?) - */ - -#ifndef _CONF_H_ - -#include "osconf.h" - -#ifdef SHORTNAMES -#include "names.h" -#endif - -/* - * Language implementation-specific definitions - */ - -/* special cases */ -#ifdef __HIGHC__ -/* broken implementation of ANSI C */ -#undef __STDC__ -#endif - -#ifndef __STDC__ -#define const -#define volatile -#define signed -typedef char *pointer; /* pointer to generic data */ -#define PROTOTYPE(p) () -#else -typedef void *pointer; -#define PROTOTYPE(p) p -#endif - -/* Does your compiler understand "void"? */ -#ifdef notdef -#define void int -#endif - -/* - * A few checks to see that necessary definitions are included. - */ - -/* byte order */ - -#ifndef MSBFIRST -#ifndef LSBFIRST -/* #error byte order not defined */ -Error: byte order not defined. -#endif -#endif - -/* machine size */ -#ifndef BITS16 -#ifndef BITS32 -Error: how big is this machine anyways? -#endif -#endif - -/* end of checks */ - -#endif /* _CONF_H_ */ diff --git a/src/include/kerberosIV/krb4-proto.h b/src/include/kerberosIV/krb4-proto.h index fd770e9fa..51195a272 100644 --- a/src/include/kerberosIV/krb4-proto.h +++ b/src/include/kerberosIV/krb4-proto.h @@ -105,8 +105,10 @@ int krb_get_tf_fullname P_TYPE_((char *, char *, char *, char *)); /* get_tf_realm.c */ int krb_get_tf_realm P_TYPE_((char *, char *)); +#if 0 /* getopt.c */ int getopt P_TYPE_((int , char **, char *)); +#endif /* getrealm.c */ char *krb_realmofhost P_TYPE_((char *)); @@ -205,14 +207,16 @@ int send_to_kdc P_TYPE_((KTEXT , KTEXT , char *)); int krb_sendauth P_TYPE_((long , int , KTEXT , char *, char *, char *, u_long , MSG_DAT *, CREDENTIALS *, Key_schedule , struct sockaddr_in *, struct sockaddr_in *, char *)); int krb_sendsvc P_TYPE_((int , char *)); +#ifdef 0 /* setenv.c */ /* int setenv P_TYPE_((char *, char *, int )); -- is also in telnetd/local-proto.h */ void unsetenv P_TYPE_((char *)); char *getenv P_TYPE_((char *)); char *_findenv P_TYPE_((char *, int *)); +#endif /* stime.c */ -char *stime P_TYPE_((long *)); +char *krb_stime P_TYPE_((long *)); /* tf_shm.c */ int krb_shm_create P_TYPE_((char *)); -- 2.26.2