[Pkg-openldap-devel] [openldap] 01/02: Improve ppolicy update debconf template

[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 c4c6ced445ef324d831e54fb7cfe6aa37f6db8e0
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun Jan 8 12:41:14 2017 -0800

    Improve ppolicy update debconf template
---
 debian/changelog       |  7 +++++++
 debian/slapd.templates | 37 +++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00dd9f0..fca8406 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openldap (2.4.44+dfsg-4) UNRELEASED; urgency=medium
+
+  * Improve the slapd/ppolicy_schema_needs_update debconf template. Thanks to 
+    Justin B Rye for the review.
+
+ -- Ryan Tandy <ryan at nardis.ca>  Sun, 08 Jan 2017 12:39:19 -0800
+
 openldap (2.4.44+dfsg-3) unstable; urgency=medium
 
   * Apply upstream patch to fix FTBFS on kFreeBSD. (Closes: #845394)
diff --git a/debian/slapd.templates b/debian/slapd.templates
index afcbcb1..09f2497 100644
--- a/debian/slapd.templates
+++ b/debian/slapd.templates
@@ -156,29 +156,30 @@ __Choices: abort installation, continue regardless
 DefaultChoice: abort installation
 #flag:comment:2
 # "ppolicy", "pwdMaxRecordedFailure", and "cn=config" are not translatable.
-#flag:translate!:5,7
+#flag:comment:3
+# This paragraph is followed by the path to the generated file (not
+# translatable). The sentence continues in the following paragraph.
+#flag:comment:5
+# This paragraph continues the sentence started in the previous
+# paragraph. It is followed by a command line.
+#flag:translate!:4,6
 _Description: Manual ppolicy schema update recommended
- In the version of slapd about to be installed, the ppolicy overlay
- requires the new pwdMaxRecordedFailure attribute to be defined in the
- ppolicy schema. The schema contained in the cn=config database does not
- currently include this attribute.
- .
- You may choose to continue the installation. In this case, the
- maintainer scripts will add the new attribute automatically during the
- upgrade. However, the change will not be acted on by slapd overlays,
- and replication with other servers may be affected.
+ The new version of the Password Policy (ppolicy) overlay requires the
+ schema to define the pwdMaxRecordedFailure attribute type, which is not
+ present in the schema currently in use. It is recommended to abort the
+ upgrade now, and to update the ppolicy schema before upgrading slapd.
+ If replication is in use, the schema update should be applied on every
+ server before continuing with the upgrade.
  .
- The ppolicy schema can be updated by applying the changes found in the
- following LDIF file:
+ An LDIF file has been generated with the changes required for the upgrade:
  .
  ${ldif}
  .
- If slapd is using the default access control rules, after starting
- slapd, the changes can be applied using the following command:
+ so if slapd is using the default access control rules, these changes can be
+ applied (after starting slapd) by using the command:
  .
  ldapmodify -H ldapi:/// -Y EXTERNAL -f ${ldif}
  .
- It is recommended to abort the upgrade now and to update the ppolicy
- schema before upgrading slapd. If replication is in use, the schema
- update should be applied on every server before continuing with the
- upgrade.
+ If instead you choose to continue the installation, the new attribute
+ type will be added automatically, but the change will not be acted on
+ by slapd overlays, and replication with other servers may be affected.

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