[Pkg-openldap-devel] r978 - in openldap/trunk/debian: . po

Steve Langasek vorlon at alioth.debian.org
Sun Jan 13 06:15:59 UTC 2008


Author: vorlon
Date: 2008-01-13 06:15:59 +0000 (Sun, 13 Jan 2008)
New Revision: 978

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/po/templates.pot
   openldap/trunk/debian/slapd.templates
Log:
* Incorporate debconf template changes suggested by the debian-l10n-english
  team as part of the Smith review project.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2008-01-13 00:16:50 UTC (rev 977)
+++ openldap/trunk/debian/changelog	2008-01-13 06:15:59 UTC (rev 978)
@@ -66,6 +66,8 @@
   * Package description updates; thanks to Christian Perrier
     <bubulle at debian.org> and the Smith review project for these
     improvements.
+  * Incorporate debconf template changes suggested by the debian-l10n-english
+    team as part of the Smith review project.
 
   [ Russ Allbery ]
   * Removed fix_ldif and all remaining code to try running it on LDIF
@@ -106,7 +108,7 @@
   * Remove versioned dependency on an ancient dpkg-dev.
   * Wrap and reorder Build-Depends for readability.
 
- -- Steve Langasek <vorlon at debian.org>  Sat, 12 Jan 2008 14:00:40 -0800
+ -- Steve Langasek <vorlon at debian.org>  Sat, 12 Jan 2008 22:14:02 -0800
 
 openldap2.3 (2.3.39-1) unstable; urgency=medium
 

Modified: openldap/trunk/debian/po/templates.pot
===================================================================
--- openldap/trunk/debian/po/templates.pot	2008-01-13 00:16:50 UTC (rev 977)
+++ openldap/trunk/debian/po/templates.pot	2008-01-13 06:15:59 UTC (rev 978)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openldap2.3 at packages.debian.org\n"
-"POT-Creation-Date: 2008-01-12 14:20-0800\n"
+"POT-Creation-Date: 2008-01-12 20:20-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -18,72 +18,88 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:1001
+#: ../slapd.templates:2001
 msgid "Omit OpenLDAP server configuration?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:1001
+#: ../slapd.templates:2001
 msgid ""
 "If you enable this option, no initial configuration or database will be "
 "created for you."
 msgstr ""
 
 #. Type: select
+#. Choices
+#: ../slapd.templates:3001
+msgid "always"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../slapd.templates:3001
+msgid "when needed"
+msgstr ""
+
+#. Type: select
+#. Choices
+#: ../slapd.templates:3001
+msgid "never"
+msgstr ""
+
+#. Type: select
 #. Description
-#: ../slapd.templates:2001
+#: ../slapd.templates:3002
 msgid "Dump databases to file on upgrade:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../slapd.templates:2001
+#: ../slapd.templates:3002
 msgid ""
-"Before upgrading to a new version of the OpenLDAP server the data of your "
-"LDAP directories can be dumped to plain text files (LDIF format) which is a "
-"standardized description of that data (LDIF stands for LDAP Data Interchange "
-"Format)."
+"Before upgrading to a new version of the OpenLDAP server, the data from your "
+"LDAP directories can be dumped into plain text files in the standard LDAP "
+"Data Interchange Format."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../slapd.templates:2001
+#: ../slapd.templates:3002
 msgid ""
-"Selecting \"always\" will make the maintainer scripts dump your databases "
-"before upgrading unconditionally. Selecting \"when needed\" will only dump "
-"the database if the new version is incompatible with the old database format "
-"and it has to be reimported. The \"never\" choice will just go ahead without "
-"ever dumping your database."
+"Selecting \"always\" will cause the databases to be dumped unconditionally "
+"before an upgrade. Selecting \"when needed\" will only dump the database if "
+"the new version is incompatible with the old database format and it needs to "
+"be reimported. If you select \"never\", no dump will be done."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:3001
-msgid "Directory to dump databases:"
+#: ../slapd.templates:4001
+msgid "Directory to use for dumped databases:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:3001
+#: ../slapd.templates:4001
 msgid ""
-"Please specify the directory where the LDAP databases will be exported. "
-"Within this directory several LDIF files are created which correspond to the "
+"Please specify the directory where the LDAP databases will be exported. In "
+"this directory, several LDIF files will be created which correspond to the "
 "search bases located on the server. Make sure you have enough free space on "
-"the partition the directory is located.  The first occurrence of the string "
-"\"VERSION\" is replaced with the server version you are upgrading from. The "
-"default is /var/backups/slapd-VERSION"
+"the partition where the directory is located. The first occurrence of the "
+"string \"VERSION\" is replaced with the server version you are upgrading "
+"from."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:4001
+#: ../slapd.templates:5001
 msgid "Move old database?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:4001
+#: ../slapd.templates:5001
 msgid ""
 "There are still files in /var/lib/ldap which will probably break the "
 "configuration process. If you enable this option, the maintainer scripts "
@@ -93,182 +109,167 @@
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:5001
-msgid "Invalid configuration. Retry configuration?"
+#: ../slapd.templates:6001
+msgid "Retry configuration?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:5001
+#: ../slapd.templates:6001
 msgid ""
 "The configuration you entered is invalid. Make sure that the DNS domain name "
-"has a valid syntax, the organization is not left empty and that the admin "
+"is syntactically valid, the organization is not left empty and the admin "
 "passwords match. If you decide not to retry the configuration the LDAP "
-"server will not be set up. Run \"dpkg-reconfigure\" if you want to retry "
+"server will not be set up. Run 'dpkg-reconfigure slapd' if you want to retry "
 "later."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:6001
+#: ../slapd.templates:7001
 msgid "DNS domain name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:6001
+#: ../slapd.templates:7001
 msgid ""
-"The DNS domain name is used to construct the base DN of your LDAP directory. "
-"Entering foo.bar.org will give you the base DN dc=foo, dc=bar, dc=org."
+"The DNS domain name is used to construct the base DN of the LDAP directory. "
+"For example, 'foo.example.org' will create the directory with 'dc=foo, "
+"dc=example, dc=org' as base DN."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:7001
-msgid "Name of your organization:"
+#: ../slapd.templates:8001
+msgid "Organization name:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../slapd.templates:7001
+#: ../slapd.templates:8001
 msgid ""
-"Whatever you enter here will be stored as the name of your organization in "
-"the base DN of your LDAP directory."
+"Please enter the name of the organization to use in the base DN of your LDAP "
+"directory."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../slapd.templates:8001
-msgid "Admin password:"
+#: ../slapd.templates:9001
+msgid "Administrator password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../slapd.templates:8001
-msgid " Please enter the password for the admin entry in your LDAP directory."
+#: ../slapd.templates:9001
+msgid "Please enter the password for the admin entry in your LDAP directory."
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../slapd.templates:9001
+#: ../slapd.templates:10001
 msgid "Confirm password:"
 msgstr ""
 
 #. Type: password
 #. Description
-#: ../slapd.templates:9001
+#: ../slapd.templates:10001
 msgid ""
-"Please reenter the admin password for your LDAP directory for verification."
+"Please enter the admin password for your LDAP directory again to verify that "
+"you have typed it correctly."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../slapd.templates:10001
+#: ../slapd.templates:11001
 msgid "Password mismatch"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../slapd.templates:10001
-msgid ""
-"The admin password and its confirmation must match. Please note that "
-"differences such as uppercase/lowercase and added whitespace matter."
+#: ../slapd.templates:11001
+msgid "The two passwords you entered were not the same. Please try again."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:11001
-msgid "Do you want your database to be removed when slapd is purged?"
-msgstr ""
-
-#. Type: password
-#. Description
 #: ../slapd.templates:12001
-msgid "Encrypted admin password:"
+msgid "Do you want the database to be removed when slapd is purged?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid "Allow LDAPv2 protocol?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:13001
+#: ../slapd.templates:14001
 msgid ""
-"The slapd daemon now disables the old LDAPv2 protocol by default. Programs "
-"and users are generally expected to be upgraded to LDAPv3. If you have old "
-"programs which have not been moved to use LDAPv3 and you still need LDAPv2 "
-"support then select this option and 'allow bind_v2' will be added to your "
-"slapd.conf to tell slapd to accept LDAPv2 connections."
+"The obsolete LDAPv2 protocol is disabled by default in slapd. Programs and "
+"users should upgrade to LDAPv3.  If you have old programs which can't use "
+"LDAPv3, you should select this option and 'allow bind_v2' will be added to "
+"your slapd.conf file."
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
-msgid "Move aside current database and create a new one?"
+#: ../slapd.templates:15001
+msgid "Back up current database and create a new one?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../slapd.templates:14001
+#: ../slapd.templates:15001
 msgid ""
-"You have specified a directory suffix (domain) that doesn't match the one "
-"currently in /etc/ldap/slapd.conf.  Changing the directory suffix requires "
-"moving aside the current LDAP database and creating a new one.  Please "
-"confirm whether you want to abandon the current database (a backup will be "
-"made)."
+"The directory suffix (domain) you specified doesn't match the one currently "
+"in /etc/ldap/slapd.conf. Changing the directory suffix requires moving aside "
+"the current LDAP database and creating a new one. Please confirm whether you "
+"want to back up and abandon the current database."
 msgstr ""
 
-#. Type: note
+#. Type: error
 #. Description
-#: ../slapd.templates:15001
-msgid "slapcat failed during upgrade"
+#: ../slapd.templates:16001
+msgid "slapcat failure during upgrade"
 msgstr ""
 
-#. Type: note
+#. Type: error
 #. Description
-#: ../slapd.templates:15001
-msgid ""
-"An error occurred during the attempt to upgrade your LDAP directory. This "
-"error occurred when performing the 'slapcat' which attempts to extract your "
-"LDAP directory.  This failure could be because of an incorrect config file.  "
-"For example, if the appropriate moduleload lines for your backend database "
-"type are missing.  This failure will cause 'slapadd' later to fail too.  The "
-"old database files are about to be moved to /var/backups.  If you want to "
-"try this upgrade again then move the old database files back into place, fix "
-"whatever caused slapcat to fail, and run:\n"
-" slapcat > $location"
+#: ../slapd.templates:16001
+msgid "An error occurred while upgrading the LDAP directory."
 msgstr ""
 
-#. Type: note
+#. Type: error
 #. Description
-#: ../slapd.templates:15001
+#: ../slapd.templates:16001
 msgid ""
-"Then move the database files back to a backup area and then try running "
-"slapadd from $location."
+"The 'slapcat' program failed while extracting the LDAP directory. This may "
+"be caused by an incorrect configuration file (for example, missing "
+"'moduleload' lines to support the backend database)."
 msgstr ""
 
-#. Type: note
+#. Type: error
 #. Description
+#. This paragraph is followed by a (non translatable) paragraph
+#. containing a command line
 #: ../slapd.templates:16001
-msgid "slapadd failed during upgrade"
+msgid ""
+"This failure will cause 'slapadd' to fail later as well. The old database "
+"files will be moved to /var/backups. If you want to try this upgrade again, "
+"you should move the old database files back into place, fix whatever caused "
+"slapcat to fail, and run:"
 msgstr ""
 
-#. Type: note
+#. Type: error
 #. Description
+#. Translators: keep "$location" unchanged. This is a variable that
+#. will be replaced by a directory name at execution
 #: ../slapd.templates:16001
 msgid ""
-"An error occurred during the attempt to upgrade your LDAP directory. This "
-"error occurred when performing the 'slapadd' which attempts to populate an "
-"empty new LDAP directory using the information from your original LDAP "
-"directory.  Your original LDAP directory files have been saved in /var/"
-"backups.  The results of the attempted upgrade is the ldif file in /var/"
-"backups.  slapadd may have failed due to a configuration problem (in which "
-"case slapcat would have failed too) or due to a problem in the LDIF file.  "
-"If the problem was with the LDIF file, you may be able to fix it and attempt "
-"the slapadd again."
+"Then move the database files back to a backup area and then try running "
+"slapadd from $location."
 msgstr ""
 
 #. Type: boolean
@@ -281,24 +282,25 @@
 #. Description
 #: ../slapd.templates:17001
 msgid ""
-"The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to "
-"not work well. BDB is the recommended choice of the OpenLDAP developers."
+"The LDBM backend type has serious stability problems and has been deprecated "
+"by OpenLDAP as of 2.2. It is no longer supported by the OpenLDAP packages."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../slapd.templates:17001
 msgid ""
-"When using the BDB backend make sure you configure BDB properly. For "
-"information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
+"When the BDB backend is used, it must be configured properly. For more "
+"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz."
 msgstr ""
 
 #. Type: boolean
 #. Description
 #: ../slapd.templates:17001
 msgid ""
-"If you enable this option an attempt will be made to update your "
-"configuration to use BDB instead of LDBM and convert your databases."
+"If you enable this option, an attempt will be made to update the "
+"configuration to use BDB instead of LDBM and convert the databases. If you "
+"do not enable this option, the upgrade will be aborted."
 msgstr ""
 
 #. Type: select
@@ -311,41 +313,19 @@
 #. Description
 #: ../slapd.templates:18001
 msgid ""
-"The BDB backend is the recommended choice of the OpenLDAP developers. When "
-"using the BDB backend make sure that you configure the underlying database "
-"for your requirements. Look into /usr/share/doc/slapd/README.DB_CONFIG.gz"
+"The HDB backend is recommended. HDB and BDB use similar storage formats, but "
+"HDB adds support for subtree renames. Both support the same configuration "
+"options."
 msgstr ""
 
 #. Type: select
 #. Description
 #: ../slapd.templates:18001
 msgid ""
-"HDB is the next generation of BDB which might replace it sometime in the "
-"future. There are some problems still in the HDB code of the 2.2 series of "
-"OpenLDAP so you should probably stick to BDB until version 2.3."
+"In either case, you should review the resulting database configuration for "
+"your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more details."
 msgstr ""
 
-#. Type: select
-#. Description
-#: ../slapd.templates:18001
-msgid ""
-"The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in "
-"purpose and back-bdb evolved from experience gained from back-ldbm, but the "
-"two are quite distinct today. They both store entries based on a 32-bit "
-"entry ID key, and they use a dn2id table to map from DNs to entry IDs. They "
-"both perform attribute indexing using the same code, and store index data as "
-"lists of entry IDs. As such, the LDAP-specific features they offer are "
-"nearly identical. The differences are in the APIs used to implement the "
-"databases. back-ldbm uses a generic database API that can plug into several "
-"different database packages. In Debian, it's built against BerkeleyDB (BDB). "
-"While BerkeleyDB supports this generic interface, it also offers a much "
-"richer API that has a lot more power and a lot more complexity. back-bdb is "
-"written specifically for the full BDB API, and uses some of BDB's more "
-"advanced features to offer transaction processing, fine grained locking, and "
-"other features that offer improved concurrency and reliability. For more "
-"information, see /usr/share/doc/slapd/README.DB_CONFIG.gz"
-msgstr ""
-
 #. Type: error
 #. Description
 #: ../slapd.templates:19001

Modified: openldap/trunk/debian/slapd.templates
===================================================================
--- openldap/trunk/debian/slapd.templates	2008-01-13 00:16:50 UTC (rev 977)
+++ openldap/trunk/debian/slapd.templates	2008-01-13 06:15:59 UTC (rev 978)
@@ -7,30 +7,29 @@
 
 Template: slapd/dump_database
 Type: select
-Choices: always, when needed, never
+__Choices: always, when needed, never
 Default: when needed
 _Description: Dump databases to file on upgrade:
- Before upgrading to a new version of the OpenLDAP server the data of
- your LDAP directories can be dumped to plain text files (LDIF format)
- which is a standardized description of that data (LDIF stands for
- LDAP Data Interchange Format).
+ Before upgrading to a new version of the OpenLDAP server, the data from
+ your LDAP directories can be dumped into plain text files in the
+ standard LDAP Data Interchange Format.
  .
- Selecting "always" will make the maintainer scripts dump your
- databases before upgrading unconditionally. Selecting "when needed"
- will only dump the database if the new version is incompatible with
- the old database format and it has to be reimported. The "never"
- choice will just go ahead without ever dumping your database.
+ Selecting "always" will cause the databases to be dumped
+ unconditionally before an upgrade. Selecting "when needed" will only
+ dump the database if the new version is incompatible with the old
+ database format and it needs to be reimported. If you select "never",
+ no dump will be done.
 
 Template: slapd/dump_database_destdir
 Type: string
 Default: /var/backups/slapd-VERSION
-_Description: Directory to dump databases:
+_Description: Directory to use for dumped databases:
  Please specify the directory where the LDAP databases will be exported.
- Within this directory several LDIF files are created which correspond
+ In this directory, several LDIF files will be created which correspond
  to the search bases located on the server. Make sure you have enough
- free space on the partition the directory is located.  The first
+ free space on the partition where the directory is located. The first
  occurrence of the string "VERSION" is replaced with the server version
- you are upgrading from. The default is /var/backups/slapd-VERSION
+ you are upgrading from.
 
 Template: slapd/move_old_database
 Type: boolean
@@ -44,143 +43,123 @@
 Template: slapd/invalid_config
 Type: boolean
 Default: true
-_Description: Invalid configuration. Retry configuration?
+_Description: Retry configuration?
  The configuration you entered is invalid. Make sure that the DNS domain name
- has a valid syntax, the organization is not left empty and that the admin
+ is syntactically valid, the organization is not left empty and the admin
  passwords match. If you decide not to retry the configuration the LDAP server
- will not be set up. Run "dpkg-reconfigure" if you want to retry later.
+ will not be set up. Run 'dpkg-reconfigure slapd' if you want to retry later.
 
 Template: slapd/domain
 Type: string
 _Description: DNS domain name:
- The DNS domain name is used to construct the base DN of your LDAP directory.
- Entering foo.bar.org will give you the base DN dc=foo, dc=bar, dc=org.
+ The DNS domain name is used to construct the base DN of the LDAP directory.
+ For example, 'foo.example.org' will create the directory with
+ 'dc=foo, dc=example, dc=org' as base DN.
 
 Template: shared/organization
 Type: string
-_Description: Name of your organization:
- Whatever you enter here will be stored as the name of your organization in
- the base DN of your LDAP directory.
+_Description: Organization name:
+ Please enter the name of the organization to use in the base DN of your
+ LDAP directory.
 
 Template: slapd/password1
 Type: password
-_Description: Admin password:
-  Please enter the password for the admin entry in your LDAP directory.
+_Description: Administrator password:
+ Please enter the password for the admin entry in your LDAP directory.
 
 Template: slapd/password2
 Type: password
 _Description: Confirm password:
- Please reenter the admin password for your LDAP directory for
- verification.
+ Please enter the admin password for your LDAP directory again to verify
+ that you have typed it correctly.
 
 Template: slapd/password_mismatch
 Type: note
 _Description: Password mismatch
- The admin password and its confirmation must match. Please note that
- differences such as uppercase/lowercase and added whitespace matter.
+ The two passwords you entered were not the same. Please try again.
 
 Template: slapd/purge_database
 Type: boolean
 Default: false
-_Description: Do you want your database to be removed when slapd is purged?
+_Description: Do you want the database to be removed when slapd is purged?
 
 Template: slapd/internal/adminpw
 Type: password
-_Description: Encrypted admin password:
+Description: Encrypted admin password:
+ Internal template, should never be displayed to users.
 
 Template: slapd/allow_ldap_v2
 Type: boolean
 Default: false
 _Description: Allow LDAPv2 protocol?
- The slapd daemon now disables the old LDAPv2 protocol by default.
- Programs and users are generally expected to be upgraded to LDAPv3.
- If you have old programs which have not been moved to use LDAPv3
- and you still need LDAPv2 support then select this option and
- 'allow bind_v2' will be added to your slapd.conf to tell slapd to
- accept LDAPv2 connections.
+ The obsolete LDAPv2 protocol is disabled by default in slapd. Programs
+ and users should upgrade to LDAPv3.  If you have old programs which
+ can't use LDAPv3, you should select this option and 'allow bind_v2'
+ will be added to your slapd.conf file.
 
 Template: slapd/suffix_change
 Type: boolean
 Default: false
-_Description: Move aside current database and create a new one?
- You have specified a directory suffix (domain) that doesn't match the
- one currently in /etc/ldap/slapd.conf.  Changing the directory suffix
+_Description: Back up current database and create a new one?
+ The directory suffix (domain) you specified doesn't match the
+ one currently in /etc/ldap/slapd.conf. Changing the directory suffix
  requires moving aside the current LDAP database and creating a new
- one.  Please confirm whether you want to abandon the current database
- (a backup will be made).
+ one. Please confirm whether you want to back up and abandon the current
+ database.
 
 Template: slapd/upgrade_slapcat_failure
-Type: note
-_Description: slapcat failed during upgrade
- An error occurred during the attempt to upgrade your LDAP directory.
- This error occurred when performing the 'slapcat' which attempts to
- extract your LDAP directory.  This failure could be because of an
- incorrect config file.  For example, if the appropriate moduleload
- lines for your backend database type are missing.  This failure
- will cause 'slapadd' later to fail too.  The old database files are
- about to be moved to /var/backups.  If you want to try this upgrade
- again then move the old database files back into place, fix whatever
- caused slapcat to fail, and run:
+Type: error
+#flag:translate!:5
+#flag:comment:4
+# This paragraph is followed by a (non translatable) paragraph
+# containing a command line
+#flag:comment:6
+# Translators: keep "$location" unchanged. This is a variable that
+# will be replaced by a directory name at execution
+_Description: slapcat failure during upgrade
+ An error occurred while upgrading the LDAP directory.
+ .
+ The 'slapcat' program failed while extracting the LDAP directory. This
+ may be caused by an incorrect configuration file (for example, missing
+ 'moduleload' lines to support the backend database).
+ .
+ This failure will cause 'slapadd' to fail later as well. The old database
+ files will be moved to /var/backups. If you want to try this upgrade
+ again, you should move the old database files back into place, fix
+ whatever caused slapcat to fail, and run:
+ .
   slapcat > $location
  .
  Then move the database files back to a backup area and then try running
  slapadd from $location.
 
-Template: slapd/upgrade_slapadd_failure
-Type: note
-_Description: slapadd failed during upgrade
- An error occurred during the attempt to upgrade your LDAP directory.
- This error occurred when performing the 'slapadd' which attempts to
- populate an empty new LDAP directory using the information from your
- original LDAP directory.  Your original LDAP directory files have
- been saved in /var/backups.  The results of the attempted upgrade
- is the ldif file in /var/backups.  slapadd may have failed due to
- a configuration problem (in which case slapcat would have failed
- too) or due to a problem in the LDIF file.  If the problem was with the
- LDIF file, you may be able to fix it and attempt the slapadd again.
-
 Template: slapd/migrate_ldbm_to_bdb
 Type: boolean
 Default: true
 _Description: Change backend type from LDBM to BDB?
- The LDBM backend type has been deprecated in OpenLDAP 2.2 and has shown to not
- work well. BDB is the recommended choice of the OpenLDAP developers.
+ The LDBM backend type has serious stability problems and has been
+ deprecated by OpenLDAP as of 2.2. It is no longer supported by the
+ OpenLDAP packages.
  .
- When using the BDB backend make sure you configure BDB properly. For
- information to do so, see /usr/share/doc/slapd/README.DB_CONFIG.gz
+ When the BDB backend is used, it must be configured properly. For
+ more information, see /usr/share/doc/slapd/README.DB_CONFIG.gz.
  .
- If you enable this option an attempt will be made to update your
- configuration to use BDB instead of LDBM and convert your databases.
+ If you enable this option, an attempt will be made to update the
+ configuration to use BDB instead of LDBM and convert the databases.
+ If you do not enable this option, the upgrade will be aborted.
 
 Template: slapd/backend
 Type: select
 Choices: BDB, HDB
-Default: BDB
+Default: HDB
 _Description: Database backend to use:
- The BDB backend is the recommended choice of the OpenLDAP developers.
- When using the BDB backend make sure that you configure the underlying
- database for your requirements.
- Look into /usr/share/doc/slapd/README.DB_CONFIG.gz
+ The HDB backend is recommended. HDB and BDB use similar storage formats,
+ but HDB adds support for subtree renames. Both support the same
+ configuration options.
  .
- HDB is the next generation of BDB which might replace it sometime in
- the future. There are some problems still in the HDB code of the 2.2
- series of OpenLDAP so you should probably stick to BDB until version 2.3.
- .
- The BDB backend (back-bdb) and LDBM backend (back-ldbm) are comparable in
- purpose and back-bdb evolved from experience gained from back-ldbm, but the
- two are quite distinct today. They both store entries based on a 32-bit entry
- ID key, and they use a dn2id table to map from DNs to entry IDs. They both
- perform attribute indexing using the same code, and store index data as lists
- of entry IDs. As such, the LDAP-specific features they offer are nearly
- identical. The differences are in the APIs used to implement the databases.
- back-ldbm uses a generic database API that can plug into several different
- database packages. In Debian, it's built against BerkeleyDB (BDB). While
- BerkeleyDB supports this generic interface, it also offers a much richer API
- that has a lot more power and a lot more complexity. back-bdb is written
- specifically for the full BDB API, and uses some of BDB's more advanced
- features to offer transaction processing, fine grained locking, and other
- features that offer improved concurrency and reliability. For more
- information, see /usr/share/doc/slapd/README.DB_CONFIG.gz
+ In either case, you should review the resulting database configuration
+ for your needs. See /usr/share/doc/slapd/README.DB_CONFIG.gz for more
+ details.
 
 Template: slapd/slurpd_obsolete
 Type: error




More information about the Pkg-openldap-devel mailing list