diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2012-02-12 01:02:33 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2012-02-12 01:02:33 +0000 |
| commit | 204b7775f5c1ffbe6ed20f841cbfe7185724188f (patch) | |
| tree | edcb2e8a35756689c0f47e94cb22dbeb20ffcd69 /net-nds | |
| parent | Bug #337504: compile-fix for gnutls linked with gcrypt. Relies on WANT_AUTOMA... (diff) | |
| download | gentoo-2-204b7775f5c1ffbe6ed20f841cbfe7185724188f.tar.gz gentoo-2-204b7775f5c1ffbe6ed20f841cbfe7185724188f.tar.bz2 gentoo-2-204b7775f5c1ffbe6ed20f841cbfe7185724188f.zip | |
Bug #401801: Fix slapd/net/dbus circular init dependency loop for nss_ldap usecase
(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
| -rw-r--r-- | net-nds/openldap/ChangeLog | 7 | ||||
| -rw-r--r-- | net-nds/openldap/files/slapd-confd | 5 | ||||
| -rw-r--r-- | net-nds/openldap/files/slapd-initd | 8 |
3 files changed, 15 insertions, 5 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog index 8dd4c24162ec..369871c5e9bc 100644 --- a/net-nds/openldap/ChangeLog +++ b/net-nds/openldap/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-nds/openldap # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.390 2012/02/12 00:54:14 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.391 2012/02/12 01:02:33 robbat2 Exp $ + + 12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> files/slapd-confd, + files/slapd-initd: + Bug #401801: Fix slapd/net/dbus circular init dependency loop for nss_ldap + usecase 12 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> +files/openldap-2.4.28-gnutls-gcrypt.patch, openldap-2.4.21.ebuild, diff --git a/net-nds/openldap/files/slapd-confd b/net-nds/openldap/files/slapd-confd index 2240ad3f3022..28e9d23520b7 100644 --- a/net-nds/openldap/files/slapd-confd +++ b/net-nds/openldap/files/slapd-confd @@ -7,3 +7,8 @@ # OPTS="-h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" # Uncomment the below to use the new slapd configuration for openldap 2.3 #OPTS="-F /etc/openldap/slapd.d -h 'ldaps:// ldap:// ldapi://%2fvar%2frun%2fopenldap%2fslapd.sock'" +# +# If you change the above listen statement to bind on a specific IP for +# listening, you should ensure that interface is up here (change eth0 as +# needed). +#rc_need="net.eth0" diff --git a/net-nds/openldap/files/slapd-initd b/net-nds/openldap/files/slapd-initd index 0746cf47cd4e..51e607e2e4ab 100644 --- a/net-nds/openldap/files/slapd-initd +++ b/net-nds/openldap/files/slapd-initd @@ -1,11 +1,11 @@ #!/sbin/runscript -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2012 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.3 2009/07/28 21:28:25 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/files/slapd-initd,v 1.4 2012/02/12 01:02:32 robbat2 Exp $ depend() { - need net - before dbus hald avahi-daemon + need net.lo + before hald avahi-daemon } start() { |