[krb5] - kadmind.init: drop the attempt to detect no-database-present errors (#723723)

Nalin Dahyabhai nalin at fedoraproject.org
Fri Jul 22 20:58:03 UTC 2011


commit a0e423054a85c14dcdaf4d9e69d7952145924141
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Wed Jul 20 17:58:20 2011 -0400

    - kadmind.init: drop the attempt to detect no-database-present errors (#723723)

 kadmind.init |    8 --------
 krb5.spec    |    5 ++++-
 2 files changed, 4 insertions(+), 9 deletions(-)
---
diff --git a/kadmind.init b/kadmind.init
index 6568559..8915e2b 100755
--- a/kadmind.init
+++ b/kadmind.init
@@ -41,14 +41,6 @@ RETVAL=0
 
 # Shell functions to cut down on useless shell instances.
 start() {
-  	if [ ! -f /var/kerberos/krb5kdc/principal ] ; then
-	    # Make an educated guess -- if they're using kldap somewhere,
-	    # then we don't know for sure that this is an error.
-  	    if ! grep -q 'db_library.*=.*kldap' /etc/krb5.conf ; then
-	        echo $"Error. Default principal database does not exist."
-	        exit 1
-	    fi
-	fi
   	if [ -f /var/kerberos/krb5kdc/kpropd.acl ] ; then
 	    echo $"Error. This appears to be a slave server, found kpropd.acl"
 	    exit 6
diff --git a/krb5.spec b/krb5.spec
index 311b065..2929fba 100644
--- a/krb5.spec
+++ b/krb5.spec
@@ -6,7 +6,7 @@
 Summary: The Kerberos network authentication system
 Name: krb5
 Version: 1.9.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Maybe we should explode from the now-available-to-everybody tarball instead?
 # http://web.mit.edu/kerberos/dist/krb5/1.9/krb5-1.9.1-signed.tar
 Source0: krb5-%{version}.tar.gz
@@ -666,6 +666,9 @@ exit 0
 %{_sbindir}/uuserver
 
 %changelog
+* Wed Jul 20 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9.1-7
+- kadmind.init: drop the attempt to detect no-database-present errors (#723723)
+
 * Tue Jul 19 2011 Nalin Dahyabhai <nalin at redhat.com> 1.9.1-6
 - backport fixes to teach libkrb5 to use descriptors higher than FD_SETSIZE
   to talk to a KDC by using poll() if it's detected at compile-time (#701446,


More information about the scm-commits mailing list