summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2009-03-05 10:30:36 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2009-03-05 10:30:36 +0000
commitde1d3b546a8f3f9cb6d629b48090c1ac946fb659 (patch)
tree049180ccfba07a18dde69dffa2905004390b3590 /net-nds
parentAdded net-wireless/bluez as an option for dep/rdep (tested and works fine). (diff)
downloadgentoo-2-de1d3b546a8f3f9cb6d629b48090c1ac946fb659.tar.gz
gentoo-2-de1d3b546a8f3f9cb6d629b48090c1ac946fb659.tar.bz2
gentoo-2-de1d3b546a8f3f9cb6d629b48090c1ac946fb659.zip
Bug #261287, no longer allowed to have a comment at the end of a line with other content.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'net-nds')
-rw-r--r--net-nds/openldap/ChangeLog7
-rw-r--r--net-nds/openldap/files/openldap-2.3.34-slapd-conf3
2 files changed, 8 insertions, 2 deletions
diff --git a/net-nds/openldap/ChangeLog b/net-nds/openldap/ChangeLog
index 4108a611c95a..7a276af94918 100644
--- a/net-nds/openldap/ChangeLog
+++ b/net-nds/openldap/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-nds/openldap
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.339 2009/01/15 11:12:28 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/openldap/ChangeLog,v 1.340 2009/03/05 10:30:36 robbat2 Exp $
+
+ 05 Mar 2009; Robin H. Johnson <robbat2@gentoo.org>
+ files/openldap-2.3.34-slapd-conf:
+ Bug #261287, no longer allowed to have a comment at the end of a line with
+ other content.
15 Jan 2009; Raúl Porcel <armin76@gentoo.org> openldap-2.3.43.ebuild,
openldap-2.3.43-r1.ebuild, openldap-2.4.11-r1.ebuild:
diff --git a/net-nds/openldap/files/openldap-2.3.34-slapd-conf b/net-nds/openldap/files/openldap-2.3.34-slapd-conf
index 6f5ea4be3fd2..ad767cfdeb7c 100644
--- a/net-nds/openldap/files/openldap-2.3.34-slapd-conf
+++ b/net-nds/openldap/files/openldap-2.3.34-slapd-conf
@@ -49,7 +49,8 @@ argsfile /var/run/openldap/slapd.args
database hdb
suffix "dc=my-domain,dc=com"
-checkpoint 32 30 # <kbyte> <min>
+# <kbyte> <min>
+checkpoint 32 30
rootdn "cn=Manager,dc=my-domain,dc=com"
# Cleartext passwords, especially for the rootdn, should
# be avoid. See slappasswd(8) and slapd.conf(5) for details.