rpms/openldap/F-7 openldap-2.3.34-config.patch, 1.1, 1.2 openldap.spec, 1.69, 1.70

[Jan Šafránek (jsafrane)]

Author: jsafrane

Update of /cvs/pkgs/rpms/openldap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21246

Modified Files:
	openldap-2.3.34-config.patch openldap.spec 
Log Message:
fix default slurpd directory to /var/lib/ldap
Resolves: #424831

openldap-2.3.34-config.patch:

Index: openldap-2.3.34-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/F-7/openldap-2.3.34-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openldap-2.3.34-config.patch	13 Jul 2007 20:00:26 -0000	1.1
+++ openldap-2.3.34-config.patch	14 Jan 2008 13:11:58 -0000	1.2
@@ -96,3 +96,23 @@
 +#replica host=ldap-1.example.com:389 starttls=critical
 +#     bindmethod=sasl saslmech=GSSAPI
 +#     authcId=host/ldap-master.example.com at EXAMPLE.COM
+--- openldap-2.2.13/servers/slurpd/slurp.h	2004-01-01 13:16:42.000000000 -0500
++++ openldap-2.2.13/servers/slurpd/slurp.h	2004-06-15 11:40:04.000000000 -0400
+@@ -66,7 +66,7 @@
+ #define SERVICE_NAME	OPENLDAP_PACKAGE "-slurpd"
+ 
+ /* Default directory for slurpd's private copy of replication logs */
+-#define	DEFAULT_SLURPD_REPLICA_DIR	LDAP_RUNDIR LDAP_DIRSEP "openldap-slurp"
++#define	DEFAULT_SLURPD_REPLICA_DIR	"/var/lib/ldap"
+ 
+ /* Default name for slurpd's private copy of the replication log */
+ #define	DEFAULT_SLURPD_REPLOGFILE	"slurpd.replog"
+@@ -75,7 +75,7 @@
+ #define	DEFAULT_SLURPD_STATUS_FILE	"slurpd.status"
+ 
+ /* slurpd dump file - contents of rq struct are written here (debugging) */
+-#define	SLURPD_DUMPFILE			LDAP_TMPDIR LDAP_DIRSEP "slurpd.dump"
++#define	SLURPD_DUMPFILE			DEFAULT_SLURPD_REPLICA_DIR "/slurpd.dump"
+ 
+ /* Amount of time to sleep if no more work to do */
+ #define	DEFAULT_NO_WORK_INTERVAL	3


Index: openldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openldap/F-7/openldap.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- openldap.spec	2 Nov 2007 12:07:42 -0000	1.69
+++ openldap.spec	14 Jan 2008 13:11:58 -0000	1.70
@@ -13,7 +13,7 @@
 Summary: The configuration files, libraries, and documentation for OpenLDAP
 Name: openldap
 Version: %{version_23}
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: OpenLDAP
 Group: System Environment/Daemons
 Source0: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/openldap-release/openldap-%{version_23}.tgz
@@ -751,6 +751,9 @@
 %attr(0644,root,root)      %{evolution_connector_libdir}/*.a
 
 %changelog
+* Mon Jan 14 2008 Jan Safranek <jsafranek at redhat.com> 2.3.34-5%{?dist}
+- fix default slurpd directory to /var/lib/ldap (#424831)
+
 * Fri Nov  2 2007 Jan Safranek <jsafranek at redhat.com> 2.3.34-4%{?dist}
 - fix various security flaws (#360081)