From: John Gilmore Date: Tue, 21 Feb 1995 04:58:50 +0000 (+0000) Subject: * config.h, config.win: Remove; merge them both into ../config.h. X-Git-Tag: krb5-1.0-beta5~705 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c7aa8280bf8c8227392e7dfcf3c5c9793fbf7d62;p=krb5.git * config.h, config.win: Remove; merge them both into ../config.h. Now that we aren't using imake, this isn't a generated header file. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4957 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog index 4bb518084..6020400d0 100644 --- a/src/include/krb5/stock/ChangeLog +++ b/src/include/krb5/stock/ChangeLog @@ -1,3 +1,8 @@ +Mon Feb 20 12:30:42 1995 John Gilmore (gnu at toad.com) + + * config.h, config.win: Remove; merge them both into ../config.h. + Now that we aren't using imake, this isn't a generated header file. + Mon Feb 20 15:25:26 1995 Keith Vetter (keithv@fusion.com) * config.h: changed API to INTERFACE. diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h deleted file mode 100644 index 2a0111438..000000000 --- a/src/include/krb5/stock/config.h +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright 1990,1991,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 definition file. - */ - - -#ifndef KRB5_CONFIG__ -#define KRB5_CONFIG__ - -#ifndef KRB5_AUTOCONF__ -#define KRB5_AUTOCONF__ -#include "autoconf.h" -#endif - -#ifdef SYSV -/* Change srandom and random to use rand and srand */ -/* Taken from the Sandia changes. XXX We should really just include */ -/* srandom and random into Kerberos release, since rand() is a really */ -/* bad random number generator.... [tytso:19920616.2231EDT] */ -#define random() rand() -#define srandom(a) srand(a) -#ifndef unicos61 -#define utimes(a,b) utime(a,b) -#endif /* unicos61 */ -#endif /* SYSV */ - -/* XXX these should be parameterized soon... */ -#define PROVIDE_DES_CBC_MD5 -#define PROVIDE_DES_CBC_CRC -#define PROVIDE_RAW_DES_CBC -#define PROVIDE_CRC32 -#define PROVIDE_DES_CBC_CKSUM -#define PROVIDE_RSA_MD4 -#define PROVIDE_RSA_MD5 - -#define DEFAULT_PWD_STRING1 "Enter password:" -#define DEFAULT_PWD_STRING2 "Re-enter password for verification:" - -#define KRB5_KDB_MAX_LIFE (60*60*24) /* one day */ -#define KRB5_KDB_MAX_RLIFE (60*60*24*7) /* one week */ -#define KRB5_KDB_EXPIRATION 2145830400 /* Thu Jan 1 00:00:00 2038 UTC */ - -/* - * For paranoid DOE types that don't want to give helpful error - * messages to the client....er, attacker - */ -#undef KRBCONF_VAGUE_ERRORS - -/* - * Define this if you want the KDC to modify the Kerberos database; - * this allows the last request information to be updated, as well as - * the failure count information. - * - * Note that this doesn't work if you're using slave servers!!! It - * also causes the database to be modified (and thus need to be - * locked) frequently. - */ -#undef KRBCONF_KDC_MODIFIES_KDB - -/* - * Windows requires a different api interface to each function. Here - * just define it as NULL. - */ -#define INTERFACE -#define FAR - -#endif /* KRB5_CONFIG__ */ - diff --git a/src/include/krb5/stock/config.win b/src/include/krb5/stock/config.win deleted file mode 100644 index abce886ab..000000000 --- a/src/include/krb5/stock/config.win +++ /dev/null @@ -1,57 +0,0 @@ -/* - * include/stock/config.win - * - * 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 80386 running WINDOWS - */ - -#ifndef KRB5_CONFIG__ -#define KRB5_CONFIG__ - -#define KRB5_DBM_COMPAT__ /* Don't load dbm.h */ -#define KRB5_KDB5__ /* Don't load kdb.h */ -#define KRB5_KDB5_DBM__ /* Don't load kdb_dbm.h */ - -#define BITS16 -#define SIZEOF_INT 2 -#define SIZEOF_SHORT 2 -#define SIZEOF_LONG 4 - -#define USE_STRING_H -#define HAVE_SRAND - -#ifndef _SIZE_T_DEFINED -typedef unsigned int size_t; -#define _SIZE_T_DEFINED -#endif - -#ifndef _U_TYPES_DEFINED -typedef unsigned long u_long; -typedef unsigned char u_char; -#define _U_LONG_DEFINED -#endif - -#ifndef INTERFACE -#define INTERFACE __far __export __pascal -#endif -#define FAR __far - -#endif /* KRB5_CONFIG__ */