Instead of arbitrary division of headers into include and include/krb5, with

include directives sometimes using krb5/foo.h and sometimes using foo.h, and
-I options always given for both directories in both source and build trees,
push include/krb5/* up a level and drop the krb5 directory (except, for the
moment, the change log).

Updated #include directives, -I options, and dependencies accordingly, and
deleted one or two bits of old, unused code that was noticed in the process.

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

3 files changed, 359 insertions, 0 deletions

diff --git a/src/include/stock/.Sanitize b/src/include/stock/.Sanitize
new file mode 100644
index 000000000..9a91ab33a
--- /dev/null
+++ b/src/include/stock/.Sanitize
@@ -0,0 +1,33 @@
+# Sanitize.in for Kerberos V5
+
+# Each directory to survive it's way into a release will need a file
+# like this one called "./.Sanitize".  All keyword lines must exist,
+# and must exist in the order specified by this file.  Each directory
+# in the tree will be processed, top down, in the following order.
+
+# Hash started lines like this one are comments and will be deleted
+# before anything else is done.  Blank lines will also be squashed
+# out.
+
+# The lines between the "Do-first:" line and the "Things-to-keep:"
+# line are executed as a /bin/sh shell script before anything else is
+# done in this 
+
+Do-first:
+
+# All files listed between the "Things-to-keep:" line and the
+# "Files-to-sed:" line will be kept.  All other files will be removed.
+# Directories listed in this section will have their own Sanitize
+# called.  Directories not listed will be removed in their entirety
+# with rm -rf.
+
+Things-to-keep:
+
+ChangeLog
+osconf.h
+
+Things-to-lose:
+
+Do-last:
+
+# End of file.
diff --git a/src/include/stock/ChangeLog b/src/include/stock/ChangeLog
new file mode 100644
index 000000000..c341acea6
--- /dev/null
+++ b/src/include/stock/ChangeLog
@@ -0,0 +1,196 @@
+2006-03-06  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h (DEFAULT_KDB_LIB_PATH): Add "/kdb" on end of
+	MODULEDIR.
+	(MODULE_PATH): New macro.
+
+2005-06-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h (DEFAULT_KDB_LIB_PATH): Use @MODULEDIR.  Don't use a
+	fixed global directory.
+
+2005-06-20  Ken Raeburn  <raeburn@mit.edu>
+
+	Novell merge.
+	* osconf.h (DEFAULT_KDB_LIB_PATH): Define.
+
+2004-07-09  Jeffrey Altman <jaltman@mit.edu>
+
+    * osconf.h: !!define -> !define
+
+2003-05-29  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h (DEFAULT_KDC_ENCTYPE): Default to des3 now.
+
+2003-03-06  Alexandra Ellwood  <lxs@mit.edu>
+
+    * osconf.h: Added DEFAULT_SECURE_PROFILE_PATH so that KfM will only
+    search paths that start with ~/ (homedir-based) when getting an
+    insecure context.  This is the same as DEFAULT_PROFILE_PATH on all
+    other platforms, which allows us to avoid more references to 
+    TARGET_OS_MAC in krb5 sources.
+
+2002-09-18  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h (DEFAULT_KDC_UDP_PORTLIST): Renamed from
+	DEFAULT_KDC_PORTLIST.
+	(DEFAULT_KDC_TCP_PORTLIST): New macro.
+
+2002-07-03  Alexandra Ellwood <lxs@mit.edu>
+
+	* osconf.h (DEFAULT_PROFILE_PATH): Conditionalized for Mac OS X
+	to look in Mac OS X Preferences file locations.
+	[pullup from 1-2-2-branch]
+
+2001-10-05  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h: Drop _MSDOS support.
+
+1999-09-20  Ken Raeburn  <raeburn@mit.edu>
+
+	* osconf.h (KPASSWD_PORTNAME): Define.
+
+Tue Jan 20 23:19:53 1998  Tom Yu  <tlyu@mit.edu>
+
+	* osconf.h: Add DEFAULT_KPASSWD_PORT to support Cygnus chpw.
+
+Wed Nov 13 23:58:30 1996  Tom Yu  <tlyu@mit.edu>
+
+	* osconf.h (DEFAULT_KEYTAB_NAME): Change DOS version of this to
+	FILE:%s\\krb5kt to match "krb5cc".
+
+Tue Nov 12 18:40:08 1996  Tom Yu  <tlyu@mit.edu>
+
+	* osconf.h: Change DEFAULT_KEYTAB_NAME to /etc/krb5.keytab under
+	Unix.
+
+Wed Oct 30 19:00:07 1996  Sam Hartman  <hartmans@mit.edu>
+
+	* osconf.h :  Set up to use autoconf-style directories. [37]
+
+Wed Aug 28 16:13:10 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+	* osconf.h: add KADM5 defaults: KEYTAB, ACL_FILE, PORT
+
+Mon Aug 12 16:58:16 1996  Barry Jaspan  <bjaspan@mit.edu>
+
+	* osconf.h: add KPROPD_DEFAULT_KDB5_UTIL
+
+Wed Jun 12 00:43:16 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* osconf.h: Add #ifdef _WIN32 in places where we had #ifdef _MSDOS
+
+Tue Mar  5 12:27:18 1996  Richard Basch  <basch@lehman.com>
+
+	* osconf.h (KPROPD_DEFAULT_KDB5_EDIT): kdb5_edit is now in PREFIX/sbin
+
+Sat Feb 24 18:59:39 1996  Theodore Y. Ts'o  <tytso@dcl>
+
+	* osconf.h (DEFAULT_KEYTAB_NAME): Under windows, let it be
+		%s\v5srvtab.  It will be filled in by the
+		krb5_kt_default_name with the name of windows directory.
+
+Thu Oct  5 21:45:13 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* osconf.h (DEFAULT_KDC_PROFILE): Change the name of the kdc
+		configuration file to be kdc.conf.
+		Added DEFAULT_KDC_PORTLIST.
+
+Tue Sep 26 22:47:15 1995  Mark Eichin  <eichin@cygnus.com>
+
+	* osconf.h (DEFAULT_PROFILE_PATH): look in $(prefix)/lib/krb5.conf
+	if /etc/krb5.conf isn't found.
+
+Fri Sep 29 01:45:27 1995  Theodore Y. Ts'o  <tytso@dcl>
+
+	* osconf.h: Don't include autoconf.h under Windows, since it
+		doesn't exist.
+
+Wed Sep 13 23:50:02 1995  Mark Eichin  <eichin@cygnus.com>
+
+	* osconf.h (KPROP_DEFAULT_FILE, KPROPD_DEFAULT_FILE,
+	KPROPD_DEFAULT_KDB5_EDIT, KPROPD_DEFAULT_KRB_DB): set defaults
+	correctly for kprop/kpropd in respect to prefix.
+
+Mon Jul 17 15:05:42 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* osconf.h - Add DEFAULT_KEYFILE_STUB which puts the stashfile in
+		the kdc directory instead of the root.  Also, change the
+Wed Sep 06 14:20:57 1995   Chris Provenzano (proven@mit.edu)
+
+        * osconf.h : s/keytype/enctype/g, s/KEYTYPE/ENCTYPE/g
+
+Tue Sep 05 22:10:34 1995   Chris Provenzano (proven@mit.edu)
+
+        * osconf.h : Remove krb5_enctype references, and replace with
+                krb5_keytype where appropriate.
+		default ETYPE to DES_CBC_MD5 now that it works.
+
+
+Thu Jun 22 11:53:47 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* osconf.h - Add DEFAULT_KDC_PROFILE and KDC_PROFILE_ENV for KDC
+		profile location.
+
+Thu Jun 8 14:42:56 EDT 1995	Paul Park	(pjpark@mit.edu)
+
+	* osconf.h - Restore DEFAULT_ADMIN_ACL definition to be
+		.../kadm_old.acl since kadmin.old needs this definition.
+
+Wed Jun  7 16:13:24 1995    <tytso@rsx-11.mit.edu>
+
+	* osconf.h: Use INSTALL and INSTALL_PREFIX instead of KRB5ROOT.
+		How the filenames are determined have been completely
+		revamped.
+
+Sun May 21 15:33:36 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* osconf.h: Setup the RCTMPDIR to be modified by configure. 
+
+Fri Apr 21 21:00:40 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* osconf.h: Add #define's for DEFAULT_PROFILE_FILENAME.  
+
+Tue Mar 28 19:49:56 1995 Keith Vetter (keithv@fusion.com)
+
+	* osconf.h: moved the differing part of osconf.win inside it.
+        * osconf.win: deleted.
+
+Tue Mar 7 15:09:44 1995 Keith Vetter (keithv@fusion.com)
+
+	* osconf.win: new file. Windows version of osconf with valid
+           path names.
+
+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.
+        * config.win: changed API to INTERFACE and changed BITS16
+           to SIZEOF_INT/SIZEOF_LONG to track an autoconf change.
+
+Mon Feb 6 20:5:58 1995 Keith Vetter (keithv@fusion.com)
+
+	* config.win: new file--windows base template for config.h
+	* config.h: added API definition default of NULL
+
+Thu Jan  5 17:01:03 1995  Theodore Y. Ts'o  (tytso@dcl)
+
+	* Use the service names kerberos and kerberos-sec, instead of
+		kerberos5 and kerberos4 --- the official port name is
+		kerberos, after all!
+
+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
+		cryptosystem.
+
diff --git a/src/include/stock/osconf.h b/src/include/stock/osconf.h
new file mode 100644
index 000000000..03b2ce651
--- /dev/null
+++ b/src/include/stock/osconf.h
@@ -0,0 +1,130 @@
+/*
+ * include/krb5/stock/osconf.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.  Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * 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__
+
+#if !defined(_WIN32)
+    /* Don't try to pull in autoconf.h for Windows, since it's not used */
+#ifndef KRB5_AUTOCONF__
+#define KRB5_AUTOCONF__
+#include "autoconf.h"
+#endif
+#endif
+
+#if defined(_WIN32)
+#define DEFAULT_PROFILE_FILENAME "krb5.ini"
+#define	DEFAULT_LNAME_FILENAME	"/aname"
+#define	DEFAULT_KEYTAB_NAME	"FILE:%s\\krb5kt"
+#else /* !_WINDOWS */
+#if TARGET_OS_MAC
+#define DEFAULT_SECURE_PROFILE_PATH "/Library/Preferences/edu.mit.Kerberos:/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
+#define DEFAULT_PROFILE_PATH        ("~/Library/Preferences/edu.mit.Kerberos" ":" DEFAULT_SECURE_PROFILE_PATH)
+#else
+#define DEFAULT_SECURE_PROFILE_PATH	"/etc/krb5.conf:@SYSCONFDIR/krb5.conf"
+#define DEFAULT_PROFILE_PATH        DEFAULT_SECURE_PROFILE_PATH
+#endif
+#define	DEFAULT_KEYTAB_NAME	"FILE:/etc/krb5.keytab"
+#define	DEFAULT_LNAME_FILENAME	"@PREFIX/lib/krb5.aname"
+#endif /* _WINDOWS  */
+
+#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
+#define	DEFAULT_KEYFILE_STUB	"@LOCALSTATEDIR/krb5kdc/.k5."
+#define KRB5_DEFAULT_ADMIN_ACL	"@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
+/* Used by old admin server */
+#define	DEFAULT_ADMIN_ACL	"@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
+
+/* Location of KDC profile */
+#define	DEFAULT_KDC_PROFILE	"@LOCALSTATEDIR/krb5kdc/kdc.conf"
+#define	KDC_PROFILE_ENV		"KRB5_KDC_PROFILE"
+
+#define DEFAULT_KDB_LIB_PATH	{ "@MODULEDIR/kdb", NULL }
+#define MODULE_PATH		"@MODULEDIR"
+
+#define	DEFAULT_KDC_ENCTYPE	ENCTYPE_DES3_CBC_SHA1
+#define KDCRCACHE		"dfl:krb5kdc_rcache"
+
+#define KDC_PORTNAME		"kerberos" /* for /etc/services or equiv. */
+#define KDC_SECONDARY_PORTNAME	"kerberos-sec" /* For backwards */
+					    /* compatibility with */
+					    /* port 750 clients */
+
+#define KRB5_DEFAULT_PORT	88
+#define KRB5_DEFAULT_SEC_PORT	750
+
+#define DEFAULT_KPASSWD_PORT	464
+#define KPASSWD_PORTNAME "kpasswd"
+
+#define DEFAULT_KDC_UDP_PORTLIST "88,750"
+#define DEFAULT_KDC_TCP_PORTLIST ""
+
+/*
+ * Defaults for the KADM5 admin system.
+ */
+#define DEFAULT_KADM5_KEYTAB	"@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
+#define DEFAULT_KADM5_ACL_FILE	"@LOCALSTATEDIR/krb5kdc/kadm5.acl"
+#define DEFAULT_KADM5_PORT	749 /* assigned by IANA */
+
+#define MAX_DGRAM_SIZE	4096
+#define MAX_SKDC_TIMEOUT 30
+#define SKDC_TIMEOUT_SHIFT 2		/* left shift of timeout for backoff */
+#define SKDC_TIMEOUT_1 1		/* seconds for first timeout */
+
+#define RCTMPDIR	"@KRB5RCTMPDIR"	/* directory to store replay caches */
+
+#define KRB5_PATH_TTY	"/dev/tty"
+#define KRB5_PATH_LOGIN	"@SBINDIR/login.krb5"
+#define KRB5_PATH_RLOGIN "@BINDIR/rlogin"
+
+#define KRB5_ENV_CCNAME	"KRB5CCNAME"
+
+/*
+ * krb4 kadmin stuff follows
+ */
+
+/* the default syslog file */
+#define KADM_SYSLOG  "@LOCALSTATEDIR/krb5kdc/admin_server.syslog"
+
+/* where to find the bad password table */
+#define PW_CHECK_FILE "@LOCALSTATEDIR/krb5kdc/bad_passwd"
+
+#define DEFAULT_ACL_DIR	"@LOCALSTATEDIR/krb5kdc"
+
+/*
+ * krb5 slave support follows
+ */
+
+#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
+#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
+#define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
+#define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
+#define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
+#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
+
+#endif /* KRB5_OSCONF__ */