From 160a188e650116e75f7e32fe99f8ffdd1c048243 Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@fedoraproject.org>
Date: Mon, 22 Jan 2007 21:27:49 +0000
Subject: [PATCH] - merge back changes made between fc6 and rawhide to date -
 somewhere in here we fixed the spelling of James's last name

---
 krb5.conf    | 3 ---
 krb5.spec    | 8 +++++++-
 krb5kdc.init | 3 ---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/krb5.conf b/krb5.conf
index 18b8f15..e57cf45 100644
--- a/krb5.conf
+++ b/krb5.conf
@@ -21,9 +21,6 @@
  .example.com = EXAMPLE.COM
  example.com = EXAMPLE.COM
 
-[kdc]
- profile = /var/kerberos/krb5kdc/kdc.conf
-
 [appdefaults]
  pam = {
    debug = false
diff --git a/krb5.spec b/krb5.spec
index ce50621..d923120 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -156,12 +156,18 @@ workstation.
 * Wed Dec 20 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-12
 - update backport of the preauth module interface
 
-* Mon Oct 30 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-11
+* Mon Oct 30 2006 Nalin Dahyabhai <nalin@redhat.com>
 - update backport of the preauth module interface
 - add proposed patches 4566, 4567
 - add proposed edata reporting interface for KDC
 - add temporary placeholder for module global context fixes
 
+* Mon Oct 23 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-11
+- don't bail from the KDC init script if there's no database, it may be in
+  a different location than the default (fenlason)
+- remove the [kdc] section from the default krb5.conf -- doesn't seem to have
+  been applicable for a while
+
 * Wed Oct 18 2006 Nalin Dahyabhai <nalin@redhat.com> - 1.5-10
 - rename krb5.sh and krb5.csh so that they don't overlap (#210623)
 - way-late application of added error info in kadmind.init (#65853)
diff --git a/krb5kdc.init b/krb5kdc.init
index 82b4088..76cb56c 100755
--- a/krb5kdc.init
+++ b/krb5kdc.init
@@ -28,9 +28,6 @@ krb5kdc=/usr/kerberos/sbin/krb5kdc
 
 # Sheel functions to cut down on useless shell instances.
 start() {
-  	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
-	    exit 0
-	fi
 	echo -n $"Starting $prog: "
 	daemon ${krb5kdc} ${KRB5REALM:+-r ${KRB5REALM}} $KRB5KDC_ARGS
 	RETVAL=$?