[Pkg-openldap-devel] [openldap] 281/281: Fix slapd.scripts-common fold markers.

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit a48128358af486299f3c952a24458f995882e367
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat May 9 13:00:30 2015 -0700

    Fix slapd.scripts-common fold markers.
---
 debian/changelog            |  1 +
 debian/slapd.scripts-common | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd6ac33..084034e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openldap (2.4.41+dfsg-1) UNRELEASED; urgency=medium
   * Update patches for upstream changes, drop patches included upstream.
   * debian/rules: Adjust get-orig-source target to add +dfsg to version.
   * Convert to source format 3.0 (quilt).
+  * debian/slapd.scripts-common: Fix nesting of fold markers.
 
  -- Ryan Tandy <ryan at nardis.ca>  Wed, 08 Jul 2015 02:53:48 +0000
 
diff --git a/debian/slapd.scripts-common b/debian/slapd.scripts-common
index f56b3b1..05d3fbd 100644
--- a/debian/slapd.scripts-common
+++ b/debian/slapd.scripts-common
@@ -257,17 +257,17 @@ move_incompatible_databases_away() {					# {{{
 # }}}
 # }}}
 # }}}
+# }}}
 
 # ===== Parsing the slapd configuration file ============================ {{{
 #
 # For some operations we have to know the slapd configuration. These 
 # functions are for parsing the slapd configuration file.
 
-# {{{
 # The following two functions need to support slapd.conf installations 
 # as long as upgrading from slapd.conf environment is supported.
 # They're used to dump database in preinst which may have a slapd.conf file.
-get_suffix() {							
+get_suffix() {								# {{{
 	if [ -f "${SLAPD_CONF}" ]; then
 		for f in `get_all_slapd_conf_files`; do
 			sed -n -e's/^suffix[[:space:]]\+"*\([^"]\+\)"*/\1/p' $f
@@ -296,9 +296,9 @@ get_directory() {							# {{{
 		return 1
 	fi
 }
-
+# }}}
+get_all_slapd_conf_files() {						# {{{
 # Returns the list of all the config files: slapd.conf and included files.
-get_all_slapd_conf_files() {
 	echo ${SLAPD_CONF}
 	awk '
 BEGIN { I=0 } 
@@ -603,8 +603,8 @@ backup_config_once() {							# {{{
 # }}}
 
 
+set_defaults_for_unseen_entries() {					# {{{
 # Set up the defaults for our templates
-set_defaults_for_unseen_entries() {
 	DOMAIN=`hostname -d 2>/dev/null` || true
 	if [ -z "$DOMAIN" ]; then DOMAIN='nodomain'; fi
 
@@ -618,7 +618,7 @@ set_defaults_for_unseen_entries() {
 		db_set shared/organization "$DOMAIN"
 	fi
 }
-
+# }}}
 crypt_admin_pass() {							# {{{
 # Store the encrypted admin password into the debconf db
 # Usage: crypt_admin_pass

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git