diff options
| author |   Patrick Lauer <patrick@gentoo.org> | 2013-01-15 03:53:29 +0000 |
|---|---|---|
| committer | Patrick Lauer <patrick@gentoo.org> | 2013-01-15 03:53:29 +0000 |
| commit | 2748f16d7ec2ae87437de41e9c47869021123d60 (patch) | |
| tree | 024a902621a1999ced4887c45ce7b6a5e8046e08 /net-nds | |
| parent | Dev channel bump. Remove old. (diff) | |
| download | gentoo-2-2748f16d7ec2ae87437de41e9c47869021123d60.tar.gz gentoo-2-2748f16d7ec2ae87437de41e9c47869021123d60.tar.bz2 gentoo-2-2748f16d7ec2ae87437de41e9c47869021123d60.zip | |
Rectifying incomplete fix to 2.3 init script
(Portage version: 2.2.0_alpha152/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 5 | ||||
| -rw-r--r-- | net-nds/openldap/files/slapd-initd | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 633dae44c175..86d8f6c34e63 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.427 2013/01/14 02:46:20 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.428 2013/01/15 03:53:29 patrick Exp $ + + 15 Jan 2013; Patrick Lauer <patrick@gentoo.org> files/slapd-initd: + Rectifying incomplete fix to 2.3 init script 14 Jan 2013; Patrick Lauer <patrick@gentoo.org> openldap-2.3.43-r1.ebuild, openldap-2.3.43-r2.ebuild, openldap-2.4.19-r1.ebuild, openldap-2.4.21.ebuild, diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd index 723bfcf74831..cc2e8b7e8a1b 100644 --- a/net-nds/openldap/files/slapd-initd +++ b/net-nds/openldap/files/slapd-initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.5 2013/01/14 02:30:20 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.6 2013/01/15 03:53:28 patrick Exp $ depend() { need net.lo @@ -10,7 +10,7 @@ depend() { start() { checkpath -q -d /var/run/openldap/ -o ldap:ldap - if ! checkconfig -Q ; then + if ! checkconfig ; then eerror "There is a problem with your slapd.conf!" return 1 fi @@ -24,3 +24,7 @@ stop() { start-stop-daemon --stop --signal 2 --quiet --pidfile /var/run/openldap/slapd.pid eend $? } + +checkconfig() { + /usr/sbin/slaptest -u "$@" ${OPTS_CONF} +} |