diff options
| author | Mark Eichin <eichin@mit.edu> | 1994-06-10 22:41:12 +0000 |
|---|---|---|
| committer | Mark Eichin <eichin@mit.edu> | 1994-06-10 22:41:12 +0000 |
| commit | 6a48eca000fce0622e670b72ad8f50aad9012041 (patch) | |
| tree | e5a07ab0065bf9885cd51ee49c8897c8b9b5fae4 /src/include | |
| parent | bab09a5b9fc4ec1aebce29696694a70160f7b72c (diff) | |
| download | krb5-6a48eca000fce0622e670b72ad8f50aad9012041.tar.gz krb5-6a48eca000fce0622e670b72ad8f50aad9012041.tar.xz krb5-6a48eca000fce0622e670b72ad8f50aad9012041.zip | |
do osconf in compatible way
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@3740 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/krb5/Makefile.in | 17 | ||||
| -rw-r--r-- | src/include/krb5/stock/osauto.h (renamed from src/include/krb5/osconf.h) | 36 | ||||
| -rw-r--r-- | src/include/krb5/stock/osconf.h | 1 |
3 files changed, 19 insertions, 35 deletions
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in index 97160f6d84..598bcb5ac7 100644 --- a/src/include/krb5/Makefile.in +++ b/src/include/krb5/Makefile.in @@ -1,6 +1,10 @@ srcdir = @srcdir@ VPATH = @srcdir@ +KRB5ROOT = @KRB5ROOT@ +KDB5DIR = $(KRB5ROOT) +KRB5SRVTABDIR = /etc + BUILDTOP = ../.. RM = rm -f @@ -38,3 +42,16 @@ install:: $(KRB5_HEADERS) config.h osconf.h autoconf.h @set -x; for f in $(KRB5_HEADERS) config.h osconf.h ; \ do $(INSTALL) -c $(INSTDATFLAGS) $$f $(KRB5_INCDIR)/krb5/$$f ; \ done + +PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \ + -e "s+@KDB5DIR+$(KDB5DIR)+" \ + -e "s+@KRB5SRVTABDIR+${KRB5SRVTABDIR}+" \ + -e "/UnifdefRan/,/SPLIT-HERE/d" + +OSCONFSRC = $(srcdir)/stock/osconf.h $(srcdir)/stock/osauto.h + +osconf.h: $(OSCONFSRC) + cat $(OSCONFSRC) | sed $(PROCESS_REPLACE) > osconf.new + if cmp -s osconf.new osconf.h ; then true; \ + else $(RM) osconf.h ; $(CP) osconf.new osconf.h ; fi + diff --git a/src/include/krb5/osconf.h b/src/include/krb5/stock/osauto.h index a0dac410c9..17266d3260 100644 --- a/src/include/krb5/osconf.h +++ b/src/include/krb5/stock/osauto.h @@ -1,6 +1,3 @@ -#ifdef UnifdefRan -/* WARNING: this file is automatically generated; do not edit! */ -#endif /* * $Source$ * $Author$ @@ -46,35 +43,4 @@ #define USE_TIME_H #endif /* USE_SYS_TIME_H */ -#define USE_DBM_LNAME /* Use a DBM database for the aname/lname - conversion */ - -#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" - -#define DEFAULT_KDB_FILE "@KDB5DIR/principal" -#define DEFAULT_ADMIN_ACL "@KDB5DIR/admin_acl_file" - -#define DEFAULT_KDC_ETYPE ETYPE_DES_CBC_CRC -#define DEFAULT_KDC_KEYTYPE KEYTYPE_DES -#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 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 "/usr/tmp" /* directory to store replay caches */ - -#define KRB5_PATH_TTY "/dev/tty" -#define KRB5_PATH_LOGIN "@KRB5ROOT/sbin/login.krb5" -#define KRB5_PATH_RLOGIN "@KRB5ROOT/bin/rlogin" - -#endif /* KRB5_OSCONF__ */ +/* remainder added on */ diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h index 7e46ff2c37..23a9ed1220 100644 --- a/src/include/krb5/stock/osconf.h +++ b/src/include/krb5/stock/osconf.h @@ -52,6 +52,7 @@ #define HAS_UNISTD_H #endif +/*** SPLIT-HERE ***/ #define USE_DBM_LNAME /* Use a DBM database for the aname/lname conversion */ |