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

diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog
index 1031daec4191357986ab59ec91fdc90900264797..1f23cca36969dfe70b770d72a24db6c3ca74eda5 100644 (file)
--- 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 ea5c671362cefe85310db742e3ce7e0c69434779..dee7f567c95aac92aeb1051bd6c0aa87439efeb0 100644 (file)
--- 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 6276d1ba359013ae8c78d62f0012ba8f70b9586f..e14e3e4776108cc38408fb308ade4bf65ee3bba5 100644 (file)
--- 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 48232228e592128ccbf3952c9e8e6afa10d951d2..aae22dbbc23f374463c75a7322fdf90986d759f7 100644 (file)
--- 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 2efebf417988cb5d0fb60b8e97152d61993b1019..9c24c65594659954d134694b5392b543be880987 100644 (file)
--- 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"