tag 370343 + patch
thanks
Hello openldap maintainers.
During the Debian Edu worksession in Extremadura I've created a patch in
order to preseed the default file of slapd.
Please note that this bug is a blocker bug of our very long standing issue
311188 which is sort of release critical.
So please consider to include the patch.
Thanks in advance
Greetings
Winnie, in behalf of the Debian Edu Team
--
.''`. Patrick Winnertz <winnie@debian.org>
: :' : GNU/Linux Debian Developer
`. `'` http://www.der-winnie.de http://people.skolelinux.org/~winnie
`- Debian - when you have better things to do than fixing systems
Spamtrap: winnie@qsc218.credativ.com
diff -Nurwd old/openldap2.3-2.4.7/debian/po/cs.po openldap2.3-2.4.7/debian/po/cs.po
--- old/openldap2.3-2.4.7/debian/po/cs.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/cs.po 2008-04-04 00:34:00.000000000 +0200
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap2.3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-31 21:20+0100\n"
"Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -450,3 +450,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/da.po openldap2.3-2.4.7/debian/po/da.po
--- old/openldap2.3-2.4.7/debian/po/da.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/da.po 2008-04-04 00:34:01.000000000 +0200
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap2 debconf\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2006-05-13 10:30+0200\n"
"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
"Language-Team: Danish\n"
@@ -467,3 +467,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/de.po openldap2.3-2.4.7/debian/po/de.po
--- old/openldap2.3-2.4.7/debian/po/de.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/de.po 2008-04-04 00:34:01.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap2.3 2.4.7-5\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-02-14 20:32+0100\n"
"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
@@ -468,3 +468,47 @@
"spezielle Anforderung an die Verschl�ng haben, bei denen diese Option "
"wieder aktiviert werden muss, lesen Sie die Ausgabe von �gnutls-cli -l� aus "
"dem Paket Gnutls-bin f� Liste der von GnuTLS unterst�Chiffren."
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/es.po openldap2.3-2.4.7/debian/po/es.po
--- old/openldap2.3-2.4.7/debian/po/es.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/es.po 2008-04-04 00:34:01.000000000 +0200
@@ -33,7 +33,7 @@
msgstr ""
"Project-Id-Version: openldap 2.3.30\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-13 00:52-0800\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -481,3 +481,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/fi.po openldap2.3-2.4.7/debian/po/fi.po
--- old/openldap2.3-2.4.7/debian/po/fi.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/fi.po 2008-04-04 00:34:01.000000000 +0200
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: openldap2.3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-26 23:23+0200\n"
"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -437,3 +437,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/fr.po openldap2.3-2.4.7/debian/po/fr.po
--- old/openldap2.3-2.4.7/debian/po/fr.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/fr.po 2008-04-04 00:34:01.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-22 18:10+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -460,3 +460,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/gl.po openldap2.3-2.4.7/debian/po/gl.po
--- old/openldap2.3-2.4.7/debian/po/gl.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/gl.po 2008-04-04 00:34:01.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap2.3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-28 18:58+0000\n"
"Last-Translator: Jacobo Tarrio <jtarrio@debian.org>\n"
"Language-Team: Galician <proxecto@trasno.net>\n"
@@ -445,3 +445,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/it.po openldap2.3-2.4.7/debian/po/it.po
--- old/openldap2.3-2.4.7/debian/po/it.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/it.po 2008-04-04 00:34:01.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: openldap2.3 2.3.38 italian debconf templates\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2007-11-17 13:43+0100\n"
"Last-Translator: Luca Monducci <luca.mo@tiscali.it>\n"
"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -453,3 +453,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/ja.po openldap2.3-2.4.7/debian/po/ja.po
--- old/openldap2.3-2.4.7/debian/po/ja.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/ja.po 2008-04-04 00:34:01.000000000 +0200
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap2.3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-23 12:16+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -444,3 +444,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/nl.po openldap2.3-2.4.7/debian/po/nl.po
--- old/openldap2.3-2.4.7/debian/po/nl.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/nl.po 2008-04-04 00:34:01.000000000 +0200
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: openldap2\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-02-01 14:32+0100\n"
"Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n"
"Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n"
@@ -463,3 +463,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/pt_BR.po openldap2.3-2.4.7/debian/po/pt_BR.po
--- old/openldap2.3-2.4.7/debian/po/pt_BR.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/pt_BR.po 2008-04-04 00:34:01.000000000 +0200
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: openldap2.3 2.4.7-3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-31 14:10-0200\n"
"Last-Translator: Eder L. Marques (frolic) <frolic@debian-ce.org>\n"
"Language-Team: l10n Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -459,3 +459,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/pt.po openldap2.3-2.4.7/debian/po/pt.po
--- old/openldap2.3-2.4.7/debian/po/pt.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/pt.po 2008-04-04 00:34:01.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: openldap2.3 2.3.38-2\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2007-11-28 21:22+0000\n"
"Last-Translator: Tiago Fernandes <tjg.fernandes@gmail.com>\n"
"Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -453,3 +453,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/ru.po openldap2.3-2.4.7/debian/po/ru.po
--- old/openldap2.3-2.4.7/debian/po/ru.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/ru.po 2008-04-04 00:34:01.000000000 +0200
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: 2.4.7-3\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2008-01-23 20:45+0300\n"
"Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -455,3 +455,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/templates.pot openldap2.3-2.4.7/debian/po/templates.pot
--- old/openldap2.3-2.4.7/debian/po/templates.pot 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/templates.pot 2008-04-04 00:34:00.000000000 +0200
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -376,3 +376,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/po/vi.po openldap2.3-2.4.7/debian/po/vi.po
--- old/openldap2.3-2.4.7/debian/po/vi.po 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/po/vi.po 2008-04-04 00:34:01.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: openldap2.3 2.3.38-2\n"
"Report-Msgid-Bugs-To: openldap2.3@packages.debian.org\n"
-"POT-Creation-Date: 2008-02-09 10:32-0800\n"
+"POT-Creation-Date: 2008-04-04 00:34+0200\n"
"PO-Revision-Date: 2007-11-29 22:34+1030\n"
"Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -462,3 +462,47 @@
"output of 'gnutls-cli -l' in the gnutls-bin package for the list of ciphers "
"supported by GnuTLS."
msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid "Specify on what ports slapd should listen on"
+msgstr ""
+
+#. Type: multiselect
+#. Description
+#: ../slapd.templates:20001
+msgid ""
+"slapd is captable to serve on several ports. ldap:/// means serving on the "
+"default port without encryption ldaps:/// means serving on the default "
+"slapds port with encryption ldapi:/// means that slapd will listen on a "
+"socket"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid "Additional options for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:21001
+msgid ""
+"You can add here additional options for slapd as serving only on IPv4/IPv6 "
+"connections."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid "Specify an alternative configuration file for slapd"
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../slapd.templates:22001
+msgid ""
+"Specify here an alternative configuration file, which should be used instead "
+"of the compiled in default configuration file."
+msgstr ""
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.config openldap2.3-2.4.7/debian/slapd.config
--- old/openldap2.3-2.4.7/debian/slapd.config 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.config 2008-04-04 00:17:25.000000000 +0200
@@ -85,6 +85,9 @@
db_input high slapd/password2 || true
db_input low slapd/backend || true
db_input low slapd/purge_database || true
+ db_input low slapd/start-services || true
+ db_input low slapd/additional-options || true
+ db_input low slapd/different-configuration-file || true
# XXX - should be done more general, but for now this should do
# the trick
if [ -e "/var/lib/ldap" ] && ! is_empty_dir /var/lib/ldap; then
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.default openldap2.3-2.4.7/debian/slapd.default
--- old/openldap2.3-2.4.7/debian/slapd.default 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.default 1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-# Default location of the slapd.conf file. If empty, use the compiled-in
-# default (/etc/ldap/slapd.conf). If using the cn=config backend to store
-# configuration in LDIF, set this variable to the directory containing the
-# cn=config data.
-SLAPD_CONF=
-
-# System account to run the slapd server under. If empty the server
-# will run as root.
-SLAPD_USER="openldap"
-
-# System group to run the slapd server under. If empty the server will
-# run in the primary group of its user.
-SLAPD_GROUP="openldap"
-
-# Path to the pid file of the slapd server. If not set the init.d script
-# will try to figure it out from $SLAPD_CONF (/etc/ldap/slapd.conf by
-# default)
-SLAPD_PIDFILE=
-
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-# SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-
-# If SLAPD_NO_START is set, the init script will not start or restart
-# slapd (but stop will still work). Uncomment this if you are
-# starting slapd via some other means or if you don't want slapd normally
-# started at boot.
-#SLAPD_NO_START=1
-
-# If SLAPD_SENTINEL_FILE is set to path to a file and that file exists,
-# the init script will not start or restart slapd (but stop will still
-# work). Use this for temporarily disabling startup of slapd (when doing
-# maintenance, for example, or through a configuration management system)
-# when you don't want to edit a configuration file.
-SLAPD_SENTINEL_FILE=/etc/ldap/noslapd
-
-# For Kerberos authentication (via SASL), slapd by default uses the system
-# keytab file (/etc/krb5.keytab). To use a different keytab file,
-# uncomment this line and change the path.
-#export KRB5_KTNAME=/etc/krb5.keytab
-
-# Additional options to pass to slapd
-SLAPD_OPTIONS=""
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.example-default openldap2.3-2.4.7/debian/slapd.example-default
--- old/openldap2.3-2.4.7/debian/slapd.example-default 1970-01-01 00:00:00.000000000 +0000
+++ openldap2.3-2.4.7/debian/slapd.example-default 2008-04-04 15:59:21.000000000 +0200
@@ -0,0 +1,45 @@
+# Default location of the slapd.conf file. If empty, use the compiled-in
+# default (/etc/ldap/slapd.conf). If using the cn=config backend to store
+# configuration in LDIF, set this variable to the directory containing the
+# cn=config data.
+SLAPD_CONF=""
+
+# System account to run the slapd server under. If empty the server
+# will run as root.
+SLAPD_USER="openldap"
+
+# System group to run the slapd server under. If empty the server will
+# run in the primary group of its user.
+SLAPD_GROUP="openldap"
+
+# Path to the pid file of the slapd server. If not set the init.d script
+# will try to figure it out from $SLAPD_CONF (/etc/ldap/slapd.conf by
+# default)
+SLAPD_PIDFILE=
+
+# slapd normally serves ldap only on all TCP-ports 389. slapd can also
+# service requests on TCP-port 636 (ldaps) and requests via unix
+# sockets.
+# Example usage:
+# SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
+
+# If SLAPD_NO_START is set, the init script will not start or restart
+# slapd (but stop will still work). Uncomment this if you are
+# starting slapd via some other means or if you don't want slapd normally
+# started at boot.
+#SLAPD_NO_START=1
+
+# If SLAPD_SENTINEL_FILE is set to path to a file and that file exists,
+# the init script will not start or restart slapd (but stop will still
+# work). Use this for temporarily disabling startup of slapd (when doing
+# maintenance, for example, or through a configuration management system)
+# when you don't want to edit a configuration file.
+SLAPD_SENTINEL_FILE=/etc/ldap/noslapd
+
+# For Kerberos authentication (via SASL), slapd by default uses the system
+# keytab file (/etc/krb5.keytab). To use a different keytab file,
+# uncomment this line and change the path.
+#export KRB5_KTNAME=/etc/krb5.keytab
+
+# Additional options to pass to slapd
+SLAPD_OPTIONS=""
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.install openldap2.3-2.4.7/debian/slapd.install
--- old/openldap2.3-2.4.7/debian/slapd.install 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.install 2008-04-04 13:27:47.000000000 +0200
@@ -7,3 +7,4 @@
debian/ldiftopasswd usr/share/slapd
debian/DB_CONFIG usr/share/slapd
debian/slapd.conf usr/share/slapd
+debian/slapd.example-default usr/share/slapd
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.postinst openldap2.3-2.4.7/debian/slapd.postinst
--- old/openldap2.3-2.4.7/debian/slapd.postinst 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.postinst 2008-04-04 17:09:51.000000000 +0200
@@ -6,6 +6,39 @@
# This will be replaced with debian/slapd.scripts-common which includes
# various helper functions and $OLD_VERSION and $SLAPD_CONF
+
+# Do this before the common script is included.
+# The default file will be included there
+touch /usr/share/slapd/slapd-default.md5sum
+
+if [ -e /etc/default/slapd ] && [ "`cat /usr/share/slapd/slapd-default.md5sum`" = "`md5sum /etc/default/slapd`" ]; then
+ config="/etc/default/slapd"
+elif [ ! -e /etc/default/slapd ]; then
+ config="/etc/default/slapd"
+else
+ config="/etc/default/slapd.dpkg-dist"
+fi
+
+cp /usr/share/slapd/slapd.example-default $config
+
+db_get slapd/start-services
+if [ ! -z "$RET" ]; then
+ VAL=`echo $RET | sed -e 's#,# #g'`;
+ sed -e "s#[\#]*[[:space:]]*\(SLAPD_SERVICES\)=\"[^\"]*\"#\1=\"$VAL\"#g" -i $config
+fi
+db_get slapd/additional-options
+if [ ! -z "$RET" ]; then
+ sed -e "s#[\#]*[[:space:]]*\(SLAPD_OPTIONS\)=\"[^\"]*\"#\1=\"$RET\"#g" -i $config
+fi
+db_get slapd/different-configuration-file
+if [ ! -z "$RET" ]; then
+ sed -e "s#[\#]*[[:space:]]*\(SLAPD_CONF\)=\"[^\"]*\"#\1=\"$RET\"#g" -i $config
+fi
+
+if [ "$config" = "/etc/default/slapd" ]; then
+ md5sum $config > /usr/share/slapd/slapd-default.md5sum
+fi
+
#SCRIPTSCOMMON#
postinst_initial_configuration() { # {{{
@@ -98,6 +131,7 @@
postinst_upgrade_configuration
fi
+
db_stop || true
#DEBHELPER#
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.postrm openldap2.3-2.4.7/debian/slapd.postrm
--- old/openldap2.3-2.4.7/debian/slapd.postrm 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.postrm 2008-04-04 16:48:13.000000000 +0200
@@ -30,6 +30,9 @@
rm -rf /var/lib/ldap || true
echo done
fi
+ rm -f /etc/default/slapd
+ rm -f /etc/default/slapd.dpkg-dist
+ rm -f /usr/share/slapd/slapd-default.md5sum
fi
#DEBHELPER#
diff -Nurwd old/openldap2.3-2.4.7/debian/slapd.templates openldap2.3-2.4.7/debian/slapd.templates
--- old/openldap2.3-2.4.7/debian/slapd.templates 2008-04-04 17:10:36.000000000 +0200
+++ openldap2.3-2.4.7/debian/slapd.templates 2008-04-04 00:14:40.000000000 +0200
@@ -187,3 +187,25 @@
specific encryption needs that require this option to be re-enabled,
see the output of 'gnutls-cli -l' in the gnutls-bin package for the
list of ciphers supported by GnuTLS.
+
+Template: slapd/start-services
+Type: multiselect
+Choices: ldap:///, ldaps:///, ldapi:///
+Default: ldap:///
+_Description: Specify on what ports slapd should listen on
+ slapd is captable to serve on several ports.
+ ldap:/// means serving on the default port without encryption
+ ldaps:/// means serving on the default slapds port with encryption
+ ldapi:/// means that slapd will listen on a socket
+
+Template: slapd/additional-options
+Type: string
+_Description: Additional options for slapd
+ You can add here additional options for slapd as serving only on
+ IPv4/IPv6 connections.
+
+Template: slapd/different-configuration-file
+Type: string
+_Description: Specify an alternative configuration file for slapd
+ Specify here an alternative configuration file, which should be used
+ instead of the compiled in default configuration file.
Attachment:
signature.asc
Description: This is a digitally signed message part.