From 916cbca281e4baf6c4dc6d9e1ac87ef15557146d Mon Sep 17 00:00:00 2001
From: Jan Vcelak <jvcelak@redhat.com>
Date: Wed, 27 Jun 2012 14:05:10 +0200
Subject: [PATCH] fix: slapd fails to start on reboot

Resolves: #829272
---
 openldap.spec | 1 +
 slapd.service | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/openldap.spec b/openldap.spec
index a752cc4..a6d638b 100644
--- a/openldap.spec
+++ b/openldap.spec
@@ -672,6 +672,7 @@ exit 0
 - fix: TLS error messages overwriting in tlsm_verify_cert() (#810462)
 - fix: reading pin from file can make all TLS connections hang (#829317)
 - CVE-2012-2668: cipher suite selection by name can be ignored (#825875)
+- fix: slapd fails to start on reboot (#829272)
 
 * Fri May 18 2012 Jan Vcelak <jvcelak@redhat.com> 2.4.31-2
 - fix: nss-tools package is required by the base package, not the server subpackage
diff --git a/slapd.service b/slapd.service
index f930186..2bae34d 100644
--- a/slapd.service
+++ b/slapd.service
@@ -9,7 +9,6 @@ Environment="SLAPD_URLS=ldap:/// ldapi:///" "SLAPD_OPTIONS="
 EnvironmentFile=/etc/sysconfig/slapd
 ExecStartPre=/usr/libexec/openldap/check-config.sh
 ExecStart=/usr/sbin/slapd -u ldap -h ${SLAPD_URLS} $SLAPD_OPTIONS
-TimeoutSec=3
 
 [Install]
 WantedBy=multi-user.target