0.3d: path settings

[GOMBAS Gabor <gombasg@inf.elte.hu>]

Hello,

If you would like the '--with-sysconfdir=...' and '--with-localstatedir=...'
configure options to take any effect, you need the following patch:

diff -u -r heimdal-0.3d.orig/acconfig.h heimdal-0.3d/acconfig.h
--- heimdal-0.3d.orig/acconfig.h	Thu Dec 21 22:58:00 2000
+++ heimdal-0.3d/acconfig.h	Thu Dec 21 22:58:52 2000
@@ -4,6 +4,8 @@
 #undef LIBDIR
 #undef LIBEXECDIR
 #undef SBINDIR
+#undef SYSCONFDIR
+#undef LOCALSTATEDIR
 
 #undef HAVE_INT8_T
 #undef HAVE_INT16_T
diff -u -r heimdal-0.3d.orig/cf/misc.m4 heimdal-0.3d/cf/misc.m4
--- heimdal-0.3d.orig/cf/misc.m4	Thu Dec 21 22:58:18 2000
+++ heimdal-0.3d/cf/misc.m4	Thu Dec 21 23:03:30 2000
@@ -10,6 +10,8 @@
 #undef LIBDIR
 #undef LIBEXECDIR
 #undef SBINDIR
+#undef SYSCONFDIR
+#undef LOCALSTATEDIR
 
 #undef HAVE_INT8_T
 #undef HAVE_INT16_T
diff -u -r heimdal-0.3d.orig/configure.in heimdal-0.3d/configure.in
--- heimdal-0.3d.orig/configure.in	Thu Dec 21 22:58:00 2000
+++ heimdal-0.3d/configure.in	Thu Dec 21 23:00:15 2000
@@ -641,9 +641,9 @@
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-for i in bin lib libexec sbin; do
+for i in bin lib libexec sbin sysconf localstate; do
 	i=${i}dir
-	foo=`echo $i | tr 'xindiscernible' 'XINDISCERNIBLE'`
+	foo=`echo $i | tr 'atofxyindiscernible' 'ATOFXYINDISCERNIBLE'`
 	x="\$${i}"
 	eval y="$x"
 	while test "x$y" != "x$x"; do
@@ -655,7 +655,9 @@
 AH_BOTTOM([#undef BINDIR 
 #undef LIBDIR
 #undef LIBEXECDIR
-#undef SBINDIR])
+#undef SBINDIR
+#undef SYSCONFDIR
+#undef LOCALSTATEDIR])
 
 if false; then
 	# hack to shut up automake
diff -u -r heimdal-0.3d.orig/lib/hdb/hdb.h heimdal-0.3d/lib/hdb/hdb.h
--- heimdal-0.3d.orig/lib/hdb/hdb.h	Thu Dec 21 22:58:10 2000
+++ heimdal-0.3d/lib/hdb/hdb.h	Thu Dec 21 23:03:30 2000
@@ -78,7 +78,7 @@
     krb5_error_code (*destroy)(krb5_context, struct HDB*);
 }HDB;
 
-#define HDB_DB_DIR "/var/heimdal"
+#define HDB_DB_DIR LOCALSTATEDIR ## "/lib/heimdal"
 #define HDB_DEFAULT_DB HDB_DB_DIR "/heimdal"
 #define HDB_DB_FORMAT_ENTRY "hdb/db-format"
 
diff -u -r heimdal-0.3d.orig/lib/krb5/cache.c heimdal-0.3d/lib/krb5/cache.c
--- heimdal-0.3d.orig/lib/krb5/cache.c	Thu Dec 21 22:58:11 2000
+++ heimdal-0.3d/lib/krb5/cache.c	Thu Dec 21 23:03:30 2000
@@ -188,7 +188,7 @@
     else
 	snprintf(name,
 		 sizeof(name),
-		 "FILE:/tmp/krb5cc_%u",
+		 KRB5_DEFAULT_CCROOT "%u",
 		 (unsigned)getuid());
     return name;
 }
diff -u -r heimdal-0.3d.orig/lib/krb5/config_file.c heimdal-0.3d/lib/krb5/config_file.c
--- heimdal-0.3d.orig/lib/krb5/config_file.c	Thu Dec 21 22:58:11 2000
+++ heimdal-0.3d/lib/krb5/config_file.c	Thu Dec 21 23:03:30 2000
@@ -757,7 +757,7 @@
 {
     krb5_config_section *c;
 
-    printf ("%d\n", krb5_config_parse_file ("/etc/krb5.conf", &c));
+    printf ("%d\n", krb5_config_parse_file (SYSCONFDIR "/krb5.conf", &c));
     print_config (stdout, c);
     printf ("[libdefaults]ticket_lifetime = %s\n",
 	    krb5_config_get_string (context, c,
diff -u -r heimdal-0.3d.orig/lib/krb5/constants.c heimdal-0.3d/lib/krb5/constants.c
--- heimdal-0.3d.orig/lib/krb5/constants.c	Thu Dec 21 22:58:11 2000
+++ heimdal-0.3d/lib/krb5/constants.c	Thu Dec 21 23:03:30 2000
@@ -35,5 +35,5 @@
 
 RCSID("$Id: constants.c,v 1.5 2000/07/14 21:53:01 joda Exp $");
 
-const char krb5_config_file[] = "/etc/krb5.conf";
+const char krb5_config_file[] = SYSCONFDIR "/krb5.conf";
 const char krb5_defkeyname[] = KEYTAB_DEFAULT;
diff -u -r heimdal-0.3d.orig/lib/krb5/krb5_locl.h heimdal-0.3d/lib/krb5/krb5_locl.h
--- heimdal-0.3d.orig/lib/krb5/krb5_locl.h	Thu Dec 21 22:58:11 2000
+++ heimdal-0.3d/lib/krb5/krb5_locl.h	Thu Dec 21 23:03:30 2000
@@ -127,7 +127,7 @@
 #define ALLOC_SEQ(X, N) do { (X)->len = (N); ALLOC((X)->val, (N)); } while(0)
 
 /* should this be public? */
-#define KEYTAB_DEFAULT "FILE:/etc/krb5.keytab"
+#define KEYTAB_DEFAULT "FILE:" ## SYSCONFDIR ## "/krb5.keytab"
 
 #ifndef O_BINARY
 #define O_BINARY 0
diff -u -r heimdal-0.3d.orig/lib/otp/otp_locl.h heimdal-0.3d/lib/otp/otp_locl.h
--- heimdal-0.3d.orig/lib/otp/otp_locl.h	Thu Dec 21 22:58:16 2000
+++ heimdal-0.3d/lib/otp/otp_locl.h	Thu Dec 21 23:03:30 2000
@@ -66,5 +66,5 @@
 
 #define OTPKEYS "/.otpkeys"
 
-#define OTP_DB "/etc/otp"
-#define OTP_DB_LOCK "/etc/otp-lock"
+#define OTP_DB SYSCONFDIR ## "/otp"
+#define OTP_DB_LOCK SYSCONFDIR ## "/otp-lock"

Gabor

-- 
Gabor Gombas                                       Eotvos Lorand University
E-mail: gombasg@inf.elte.hu                        Hungary