[Pkg-openldap-devel] r1320 - openldap/trunk/debian

[vorlon at alioth.debian.org]

tags 594821 pending
thanks

Author: vorlon
Date: 2010-09-12 21:02:17 +0000 (Sun, 12 Sep 2010)
New Revision: 1320

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/slapd.scripts-common
Log:
debian/slapd.scripts-common: pass -g to slapadd/slapcat, so that
subordinate databases aren't incorrectly included in the dump/restore of
the parent database.  Closes: #594821.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2010-09-12 20:31:17 UTC (rev 1319)
+++ openldap/trunk/debian/changelog	2010-09-12 21:02:17 UTC (rev 1320)
@@ -22,6 +22,9 @@
   [ Peter Marschall ]
   * debian/slapd.init: correctly set the slapd.conf argument even when
     SLAPD_PIDFILE is non-empty in /etc/default/slapd.  Closes: #593880.
+  * debian/slapd.scripts-common: pass -g to slapadd/slapcat, so that
+    subordinate databases aren't incorrectly included in the dump/restore of
+    the parent database.  Closes: #594821.
 
  -- Matthijs Mohlmann <matthijs at cacholong.nl>  Mon, 06 Sep 2010 23:09:42 +0200
 

Modified: openldap/trunk/debian/slapd.scripts-common
===================================================================
--- openldap/trunk/debian/slapd.scripts-common	2010-09-12 20:31:17 UTC (rev 1319)
+++ openldap/trunk/debian/slapd.scripts-common	2010-09-12 21:02:17 UTC (rev 1320)
@@ -164,9 +164,9 @@
 			echo -n "  - directory $suffix... " >&2
 			# Need to support slapd.d migration from preinst
 			if [ -f "${SLAPD_CONF}" ]; then
-				slapcat_opts="-f ${SLAPD_CONF}"
+				slapcat_opts="-g -f ${SLAPD_CONF}"
 			else
-				slapcat_opts="-F ${SLAPD_CONF}"
+				slapcat_opts="-g -F ${SLAPD_CONF}"
 			fi
 			slapcat ${slapcat_opts} -b "$suffix" > "$file" || failed=1
 			if [ "$failed" ]; then
@@ -209,9 +209,9 @@
 		fi
 
 		if [ -f "${SLAPD_CONF}" ]; then
-			slapadd_opts="-f ${SLAPD_CONF}"
+			slapadd_opts="-g -f ${SLAPD_CONF}"
 		else
-			slapadd_opts="-F ${SLAPD_CONF}"
+			slapadd_opts="-g -F ${SLAPD_CONF}"
 		fi
 		capture_diagnostics slapadd ${slapadd_opts} \
 			-q -b "$suffix" -l "$file" || failed=1