rpms/openldap/devel ldap.init, 1.31, 1.32 ldap.sysconfig, 1.3, 1.4 openldap.spec, 1.141, 1.142
Jan Zeleny
jzeleny at fedoraproject.org
Tue Jun 9 11:44:07 UTC 2009
- Previous message: rpms/chntpw/F-11 chntpw-080526-get_abs_path.patch, NONE, 1.1 chntpw-080526-keyname-overflow.patch, NONE, 1.1 chntpw-080526-no-value.patch, NONE, 1.1 chntpw.spec, 1.5, 1.6
- Next message: rpms/openldap/F-11 ldap.init, 1.31, 1.32 ldap.sysconfig, 1.3, 1.4 openldap.spec, 1.141, 1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jzeleny
Update of /cvs/extras/rpms/openldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15025
Modified Files:
ldap.init ldap.sysconfig openldap.spec
Log Message:
Added $SLAPD_URLS variable to init script and config file (#504504)
Index: ldap.init
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/ldap.init,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- ldap.init 13 Oct 2008 10:16:30 -0000 1.31
+++ ldap.init 9 Jun 2009 11:43:35 -0000 1.32
@@ -30,6 +30,7 @@
SLAPD_LDAP="yes"
SLAPD_LDAPI="no"
SLAPD_LDAPS="no"
+SLAPD_URLS=""
SLAPD_SHUTDOWN_TIMEOUT=3
# OPTIONS, SLAPD_OPTIONS and KTB5_KTNAME are not defined
@@ -166,9 +167,9 @@ function start() {
# Define a couple of local variables which we'll need. Maybe.
user=ldap
prog=`basename ${slapd}`
- harg=""
+ harg="$SLAPD_URLS"
if test x$SLAPD_LDAP = xyes ; then
- harg="ldap:///"
+ harg="$harg ldap:///"
fi
if test x$SLAPD_LDAPS = xyes ; then
harg="$harg ldaps:///"
Index: ldap.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/ldap.sysconfig,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- ldap.sysconfig 13 Oct 2008 10:16:30 -0000 1.3
+++ ldap.sysconfig 9 Jun 2009 11:43:35 -0000 1.4
@@ -19,5 +19,13 @@
# yes/no, default: no
#SLAPD_LDAPS=no
+# Run slapd with -h "... $SLAPD_URLS ..."
+# This option could be used instead of previous three ones, but:
+# - it doesn't overwrite settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
+# - it isn't overwritten by settings of $SLAPD_LDAP, $SLAPD_LDAPS and $SLAPD_LDAPI options
+# example: SLAPD_URLS="ldapi:///var/lib/ldap_root/ldapi ldapi:/// ldaps:///"
+# default: empty
+#SLAPD_URLS=""
+
# Maximum allowed time to wait for slapd shutdown on 'service ldap stop' (in seconds)
#SLAPD_SHUTDOWN_TIMEOUT=3
Index: openldap.spec
===================================================================
RCS file: /cvs/extras/rpms/openldap/devel/openldap.spec,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -p -r1.141 -r1.142
--- openldap.spec 9 Apr 2009 14:03:02 -0000 1.141
+++ openldap.spec 9 Jun 2009 11:43:35 -0000 1.142
@@ -11,7 +11,7 @@
Summary: LDAP support libraries
Name: openldap
Version: %{version}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: OpenLDAP
Group: System Environment/Daemons
Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version}.tgz
@@ -604,6 +604,9 @@ fi
%attr(0644,root,root) %{evolution_connector_libdir}/*.a
%changelog
+* Tue Jun 09 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-4
+- added $SLAPD_URLS variable to init script (#504504)
+
* Thu Apr 09 2009 Jan Zeleny <jzeleny at redhat.com> 2.4.15-3
- extended previous patch (#481310) to remove options cfMP
from some client tools
- Previous message: rpms/chntpw/F-11 chntpw-080526-get_abs_path.patch, NONE, 1.1 chntpw-080526-keyname-overflow.patch, NONE, 1.1 chntpw-080526-no-value.patch, NONE, 1.1 chntpw.spec, 1.5, 1.6
- Next message: rpms/openldap/F-11 ldap.init, 1.31, 1.32 ldap.sysconfig, 1.3, 1.4 openldap.spec, 1.141, 1.142
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list