From c81302520a1cf9590e0b3f53220d275e0e200dc4 Mon Sep 17 00:00:00 2001
From: Ezra Peisach <epeisach@mit.edu>
Date: Sun, 21 May 1995 19:38:36 +0000
Subject: [PATCH] Determine the location of RCTMPDIR at configuration time.
 (netbsd does not have /usr/tmp)

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5833 dc483132-0cff-0310-8789-dd5450dbe970
---
 src/include/krb5/ChangeLog       |  8 ++++++++
 src/include/krb5/Makefile.in     |  2 ++
 src/include/krb5/configure.in    | 16 ++++++++++++++++
 src/include/krb5/stock/ChangeLog |  4 ++++
 src/include/krb5/stock/osconf.h  |  2 +-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 1031daec4..1f23cca36 100644
--- a/src/include/krb5/ChangeLog
+++ b/src/include/krb5/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 21 15:25:45 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
+
+	* Makefile.in (PROCESS_REPLACE): Replace the RCTMPDIR in stock.h
+		with a configuration determined directory
+
+	* configure.in: Determine which directory to use for the replay
+		cache. (/usr/tmp does not exist on netbsd).
+
 Wed May 10 13:20:47 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (install): Install ET_HEADERS...
diff --git a/src/include/krb5/Makefile.in b/src/include/krb5/Makefile.in
index ea5c67136..dee7f567c 100644
--- a/src/include/krb5/Makefile.in
+++ b/src/include/krb5/Makefile.in
@@ -1,5 +1,6 @@
 KDB5DIR = $(KRB5ROOT)
 KRB5SRVTABDIR = /etc
+KRB5RCTMPDIR= @KRB5_RCTMPDIR@
 
 ##DOSBUILDTOP = ..\..
 ##DOS!include $(BUILDTOP)\config\windows.in
@@ -51,6 +52,7 @@ install:: $(KRB5_HEADERS) osconf.h autoconf.h
 
 PROCESS_REPLACE = -e "s+@KRB5ROOT+$(KRB5ROOT)+" \
 		  -e "s+@KDB5DIR+$(KDB5DIR)+" \
+		  -e "s+@KRB5RCTMPDIR+$(KRB5RCTMPDIR)+" \
 		  -e "s+@KRB5SRVTABDIR+$(KRB5SRVTABDIR)+" 
 
 OSCONFSRC = $(srcdir)/stock/osconf.h
diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in
index 6276d1ba3..e14e3e477 100644
--- a/src/include/krb5/configure.in
+++ b/src/include/krb5/configure.in
@@ -129,6 +129,22 @@ AC_CHECK_LIB(ndbm,main)
 AC_CHECK_LIB(dbm,main)
 AC_FUNC_CHECK([dbm_open], , AC_DEFINE(ODBM))
 
+dnl
+dnl Determine where to put the replay cache.
+dnl
+AC_MSG_CHECKING([for replay cache directory])
+AC_CACHE_VAL(krb5_cv_sys_rcdir,
+[
+for t_dir in /usr/tmp /var/usr/tmp /var/tmp /tmp ; do
+	test -d $t_dir || continue
+	krb5_cv_sys_rcdir=$t_dir
+	break
+done])dnl
+AC_MSG_RESULT($krb5_cv_sys_rcdir)
+KRB5_RCTMPDIR=$krb5_cv_sys_rcdir
+AC_SUBST(KRB5_RCTMPDIR)
+
+
 AC_ARG_ENABLE([athena],
 [  --enable-athena         build with MIT Project Athena configuration],
 AC_DEFINE(KRB5_ATHENA_COMPAT),)
diff --git a/src/include/krb5/stock/ChangeLog b/src/include/krb5/stock/ChangeLog
index 48232228e..aae22dbbc 100644
--- a/src/include/krb5/stock/ChangeLog
+++ b/src/include/krb5/stock/ChangeLog
@@ -1,3 +1,7 @@
+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.  
diff --git a/src/include/krb5/stock/osconf.h b/src/include/krb5/stock/osconf.h
index 2efebf417..9c24c6559 100644
--- a/src/include/krb5/stock/osconf.h
+++ b/src/include/krb5/stock/osconf.h
@@ -80,7 +80,7 @@
 #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 RCTMPDIR	"@KRB5RCTMPDIR"	/* directory to store replay caches */
 
 #define KRB5_PATH_TTY	"/dev/tty"
 #define KRB5_PATH_LOGIN	"@KRB5ROOT/sbin/login.krb5"
-- 
2.26.2