From ffe6e243062ab331c9542bdccbd583db2347adb4 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 20 Jan 2007 17:23:36 +0000 Subject: Move osconf input file to include directory instead of keeping it in its own subdirectory. git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19092 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/Makefile.in | 6 +- src/include/osconf.hin | 139 +++++++++++++++++++++++++++++++++++++++++++++ src/include/stock/osconf.h | 139 --------------------------------------------- 3 files changed, 142 insertions(+), 142 deletions(-) create mode 100644 src/include/osconf.hin delete mode 100644 src/include/stock/osconf.h (limited to 'src/include') diff --git a/src/include/Makefile.in b/src/include/Makefile.in index 888076ee5..aaf852847 100644 --- a/src/include/Makefile.in +++ b/src/include/Makefile.in @@ -37,8 +37,8 @@ $(srcdir)/autoconf.stmp: $(srcdir)/$(thisconfigdir)/configure.in $(SRCTOP)/acloc ##DOS##autoconf.h: win-mac.h ##DOS## $(CP) win-mac.h $@ -##DOS##osconf.h: stock\osconf.h -##DOS## $(CP) stock\osconf.h $@ +##DOS##osconf.h: osconf.hin +##DOS## $(CP) osconf.hin $@ ############################################################################### ##DOS##!if 0 @@ -63,7 +63,7 @@ PROCESS_REPLACE = -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \ -e 's+@LOCALSTATEDIR+$(LOCALSTATEDIR)+' \ -e 's+@SYSCONFDIR+$(SYSCONFDIR)+' -OSCONFSRC = $(srcdir)/stock/osconf.h +OSCONFSRC = $(srcdir)/osconf.hin osconf.h: $(OSCONFSRC) Makefile cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new diff --git a/src/include/osconf.hin b/src/include/osconf.hin new file mode 100644 index 000000000..3a8ba4956 --- /dev/null +++ b/src/include/osconf.hin @@ -0,0 +1,139 @@ +/* + * 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(__MACH__) && defined(__APPLE__) +# include +#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) +#define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins" +#define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins" +#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" + +#if TARGET_OS_MAC +#define DEFAULT_KDB_LIB_PATH { KDB5_PLUGIN_BUNDLE_DIR, "@MODULEDIR/kdb", NULL } +#else +#define DEFAULT_KDB_LIB_PATH { "@MODULEDIR/kdb", NULL } +#endif + +#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__ */ diff --git a/src/include/stock/osconf.h b/src/include/stock/osconf.h deleted file mode 100644 index 3a8ba4956..000000000 --- a/src/include/stock/osconf.h +++ /dev/null @@ -1,139 +0,0 @@ -/* - * 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(__MACH__) && defined(__APPLE__) -# include -#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) -#define KRB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosFrameworkPlugins" -#define KDB5_PLUGIN_BUNDLE_DIR "/System/Library/KerberosPlugins/KerberosDatabasePlugins" -#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" - -#if TARGET_OS_MAC -#define DEFAULT_KDB_LIB_PATH { KDB5_PLUGIN_BUNDLE_DIR, "@MODULEDIR/kdb", NULL } -#else -#define DEFAULT_KDB_LIB_PATH { "@MODULEDIR/kdb", NULL } -#endif - -#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__ */ -- cgit