summaryrefslogtreecommitdiff
path: root/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch')
-rw-r--r--debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch24
1 files changed, 13 insertions, 11 deletions
diff --git a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
index 844af0c47..bb5aac91b 100644
--- a/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
+++ b/debian/patches/debian-local/0003-debian-osconf.hin-path-changes.patch
@@ -1,33 +1,35 @@
-From 5ec003b1363ccd4d89d88f83165f850bb082b98a Mon Sep 17 00:00:00 2001
+From d0706297a8a7a9fb45deb0973e15506dc31b1c83 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Mon, 26 Dec 2011 18:20:11 -0500
Subject: debian: osconf.hin path changes
Patch-Category: debian-local
---
- src/include/osconf.hin | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ src/include/osconf.hin | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/include/osconf.hin b/src/include/osconf.hin
-index 98a467454b..2f51cc13c7 100644
+index c24717be67..c103424955 100644
--- a/src/include/osconf.hin
+++ b/src/include/osconf.hin
-@@ -59,7 +59,7 @@
- #define PLUGIN_EXT "@DYNOBJEXT"
+@@ -70,8 +70,8 @@
+ #endif
#define KDC_DIR "@LOCALSTATEDIR/krb5kdc"
-#define KDC_RUN_DIR "@RUNSTATEDIR/krb5kdc"
+-#define DEFAULT_KDB_FILE KDC_DIR "/principal"
+#define KDC_RUN_DIR "/run/krb5kdc"
- #define DEFAULT_KDB_FILE KDC_DIR "/principal"
++#define DEFAULT_KDB_FILE "/var/lib/krb5kdc/principal"
#define DEFAULT_KEYFILE_STUB KDC_DIR "/.k5."
#define KRB5_DEFAULT_ADMIN_ACL KDC_DIR "/krb5_adm.acl"
-@@ -114,8 +114,8 @@
- * krb5 slave support follows
+ /* Used by old admin server */
+@@ -125,8 +125,8 @@
+ * krb5 replica support follows
*/
--#define KPROP_DEFAULT_FILE KDC_DIR "/slave_datatrans"
+-#define KPROP_DEFAULT_FILE KDC_DIR "/replica_datatrans"
-#define KPROPD_DEFAULT_FILE KDC_DIR "/from_master"
-+#define KPROP_DEFAULT_FILE "/var/lib/krb5kdc/slave_datatrans"
++#define KPROP_DEFAULT_FILE "/var/lib/krb5kdc/replica_datatrans"
+#define KPROPD_DEFAULT_FILE "/var/lib/krb5kdc/from_master"
#define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
#define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"