osconf.h, config.h: Remove remnants of unifdef support for

	building osconf.h and config.h, left over from the imake
	build system.

osconf.h: Add #ifdef for Athena configuration.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4720 dc483132-0cff-0310-8789-dd5450dbe970

5 files changed, 24 insertions, 193 deletions

diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 6972bee54..ad7b30c44 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,11 @@
+Wed Nov 30 16:18:29 1994  Theodore Y. Ts'o  (tytso@dcl)
+
+	* osconf.h, config.h: Remove remnants of unifdef support for
+		building osconf.h and config.h, left over from the imake
+		build system. 
+
+	* osconf.h: Add #ifdef for Athena configuration.
+
 Thu Oct 13 16:58:53 1994  Theodore Y. Ts'o  (tytso@dcl)
 
 	* config.h: Define PROVIDE_DES_CBC_MD5 so that we include this
diff --git a/src/include/krb5/stock/confauto.h b/src/include/krb5/stock/confauto.h
deleted file mode 100644
index 294e41bde..000000000
--- a/src/include/krb5/stock/confauto.h
+++ /dev/null
@@ -1,32 +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
diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h
index af8250c30..074106cf7 100644
--- a/src/include/krb5/stock/config.h
+++ b/src/include/krb5/stock/config.h
@@ -1,10 +1,5 @@
-#ifdef UnifdefRan
-/* WARNING: this file is automatically generated; do not edit! */
-#endif
 /*
- * include/krb5/stock/config.h
- *
- * Copyright 1990,1991 by the Massachusetts Institute of Technology.
+ * Copyright 1990,1991,1994 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
  * Export of this software from the United States of America may
@@ -31,102 +26,11 @@
 #ifndef KRB5_CONFIG__
 #define KRB5_CONFIG__
 
-#ifdef HasPosixTermiosTrue
-#define POSIX_TERMIOS
-#endif
-
-#ifdef HasPosixFileLocksTrue
-#define POSIX_FILE_LOCKS
-#endif
-
-#ifdef HasPosixTypesTrue
-#define POSIX_TYPES
-#endif
-
-#ifdef HasVoidSignalReturnTrue
-#define POSIX_SIGTYPE
-#define krb5_sigtype void
-#else
-typedef int krb5_sigtype;
-#endif
-
-#ifdef HasStringHTrue
-#define USE_STRING_H
-#endif
-
-#ifndef HasStdlibHTrue
-#define NO_STDLIB_H
-#endif
-
-#ifdef ForceStdlibH
-#define	HAS_STDLIB_H
-#endif
-
-#ifdef HasAnsiStdio
-#define	ANSI_STDIO
-#endif
-
-#ifdef ProvidePrototypes
-#ifndef KRB5_PROVIDE_PROTOTYPES
-#define KRB5_PROVIDE_PROTOTYPES YES
-#endif
-#endif
-
-#ifdef UseNarrowPrototypes
-#define NARROW_PROTOTYPES
-#endif
-
-#ifdef UseStdarg
-#define	STDARG_PROTOTYPES
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
 #endif
 
-#ifdef NoNestedPrototypes
-#define	NO_NESTED_PROTOTYPES
-#endif
-
-#ifdef UseVoid
-#define HAS_VOID_TYPE
-#endif
-
-#ifdef UseConst
-#define HAS_ANSI_CONST
-#endif
-
-#ifdef UseVolatile
-#define HAS_ANSI_VOLATILE
-#endif
-
-#ifdef Bitsize32
-#ifdef Bitsize64
- error: only one of BitsizeNN, please.
-#endif
-#ifdef Bitsize16
- error: only one of BitsizeNN, please.
-#endif
-#define BITS32
-#endif
-
-#ifdef Bitsize16
-#ifdef Bitsize64
- error: only one of BitsizeNN, please.
-#endif
-#ifdef Bitsize32
- error: only one of BitsizeNN, please.
-#endif
-#define BITS16
-#endif
-
-#ifdef Bitsize64
-#ifdef Bitsize32
- error: only one of BitsizeNN, please.
-#endif
-#ifdef Bitsize16
- error: only one of BitsizeNN, please.
-#endif
-#define BITS64
-#endif
-
-/* SPLIT-HERE */
 #ifdef SYSV
 /* Change srandom and random to use rand and srand */
 /* Taken from the Sandia changes.  XXX  We should really just include */
@@ -155,10 +59,6 @@ typedef int krb5_sigtype;
 #define	KRB5_KDB_MAX_RLIFE	(60*60*24*7) /* one week */
 #define	KRB5_KDB_EXPIRATION	2145830400 /* Thu Jan  1 00:00:00 2038 UTC */
 
-#ifdef Krb4Compat
-#define KRB5_KRB4_COMPAT
-#endif
-
 /*
  * For paranoid DOE types that don't want to give helpful error
  * messages to the client....er, attacker
diff --git a/src/include/krb5/stock/osauto.h b/src/include/krb5/stock/osauto.h
deleted file mode 100644
index d4dbcb216..000000000
--- a/src/include/krb5/stock/osauto.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * include/krb5/stock/osauto.h
- *
- * Copyright 1990,1991 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.
- * 
- *
- * Site- and OS- dependant configuration.
- */
-
-
-#ifndef KRB5_OSCONF__
-#define KRB5_OSCONF__
-
-#ifndef KRB5_AUTOCONF__
-#define KRB5_AUTOCONF__
-#include "autoconf.h"
-#endif
-
-/* remainder added on */
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 1914f741e..e316c679e 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -1,6 +1,3 @@
-#ifdef UnifdefRan
-/* WARNING: this file is automatically generated; do not edit! */
-#endif
 /*
  * include/krb5/stock/osconf.h
  *
@@ -27,34 +24,28 @@
  * Site- and OS- dependant configuration.
  */
 
-
 #ifndef KRB5_OSCONF__
 #define KRB5_OSCONF__
 
-#ifndef HasNdbmTrue
-#define ODBM
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
 #endif
 
-#ifdef UseSysTimeH
-#define	USE_SYS_TIME_H	/* Needs <sys/time.h> for time includes. */		
-#endif
-
-#ifdef HasInetTrue
-#define KRB5_USE_INET		/* Support IP address family */
-#endif
-
-#ifdef HasUnistdH
-#define	HAS_UNISTD_H
-#endif
-
-/*** SPLIT-HERE ***/
 #define	USE_DBM_LNAME		/* Use a DBM database for the aname/lname
 				   conversion */
 
+#ifdef KRB5_ATHENA_COMPAT
+#define	DEFAULT_CONFIG_FILENAME	"/etc/athena/krb.conf.v5"
+#define	DEFAULT_TRANS_FILENAME	"/etc/athena/krb.realms"
+#define	DEFAULT_LNAME_FILENAME	"/etc/athena/aname"
+#define	DEFAULT_KEYTAB_NAME	"FILE:/etc/athena/v5srvtab"
+#else
 #define	DEFAULT_CONFIG_FILENAME	"@KRB5ROOT/krb.conf"
 #define	DEFAULT_TRANS_FILENAME	"@KRB5ROOT/krb.realms"
 #define	DEFAULT_LNAME_FILENAME	"@KRB5ROOT/aname"
 #define	DEFAULT_KEYTAB_NAME	"FILE:@KRB5SRVTABDIR/v5srvtab"
+#endif
 
 #define DEFAULT_KDB_FILE        "@KDB5DIR/principal"
 #define DEFAULT_ADMIN_ACL	"@KDB5DIR/admin_acl_file"
@@ -89,10 +80,10 @@
  */
 
 /* the default syslog file */
-#define KADM_SYSLOG  "@KRB5ROOT/admin_server.syslog"
+#define KADM_SYSLOG  "@KDB5DIR/admin_server.syslog"
 
 /* where to find the bad password table */
-#define PW_CHECK_FILE "@KRB5ROOT/bad_passwd"
+#define PW_CHECK_FILE "@KDB5DIR/bad_passwd"
 
 #define DEFAULT_ACL_DIR	"@KDB5DIR"
 #endif /* KRB5_OSCONF__ */