[Pkg-openldap-devel] r822 - in openldap/trunk-2.3: debian doc/man/man1

[Russ Allbery]

Author: rra
Date: 2007-06-01 23:15:23 +0000 (Fri, 01 Jun 2007)
New Revision: 822

Modified:
   openldap/trunk-2.3/debian/changelog
   openldap/trunk-2.3/debian/control
   openldap/trunk-2.3/doc/man/man1/ldapcompare.1
Log:
* Remove conflicts with libbind-dev and bind-dev.  There no longer
  appears to be anything in those packages that would break slapd's
  resolver.  (Closes: #225896)

Modified: openldap/trunk-2.3/debian/changelog
===================================================================
--- openldap/trunk-2.3/debian/changelog	2007-05-31 05:59:02 UTC (rev 821)
+++ openldap/trunk-2.3/debian/changelog	2007-06-01 23:15:23 UTC (rev 822)
@@ -1,3 +1,11 @@
+openldap2.3 (2.3.35-2) UNRELEASED; urgency=low
+
+  * Remove conflicts with libbind-dev and bind-dev.  There no longer
+    appears to be anything in those packages that would break slapd's
+    resolver.  (Closes: #225896)
+
+ -- Russ Allbery <rra at debian.org>  Fri, 01 Jun 2007 16:14:41 -0700
+
 openldap2.3 (2.3.35-1) unstable; urgency=low
 
   * New upstream release with many bug fixes.

Modified: openldap/trunk-2.3/debian/control
===================================================================
--- openldap/trunk-2.3/debian/control	2007-05-31 05:59:02 UTC (rev 821)
+++ openldap/trunk-2.3/debian/control	2007-06-01 23:15:23 UTC (rev 822)
@@ -15,7 +15,7 @@
 Depends: ${shlibs:Depends}, coreutils (>= 4.5.1-1), psmisc, perl (>> 5.8.0) | libmime-base64-perl, libldap-2.3-0 (= ${Source-Version}), adduser
 Recommends: libsasl2-modules
 Suggests: ldap-utils
-Conflicts: umich-ldapd, ldap-server, libbind-dev, bind-dev, libltdl3 (= 1.5.4-1)
+Conflicts: umich-ldapd, ldap-server, libltdl3 (= 1.5.4-1)
 Replaces: libldap2, ldap-utils (<< 2.2.23-3)
 Provides: ldap-server
 Description: OpenLDAP server (slapd)

Modified: openldap/trunk-2.3/doc/man/man1/ldapcompare.1
===================================================================
--- openldap/trunk-2.3/doc/man/man1/ldapcompare.1	2007-05-31 05:59:02 UTC (rev 821)
+++ openldap/trunk-2.3/doc/man/man1/ldapcompare.1	2007-06-01 23:15:23 UTC (rev 822)
@@ -106,8 +106,12 @@
 Use \fIpasswd\fP as the password for simple authentication.
 .TP
 .BI \-y \ passwdfile
-Use complete contents of \fIpasswdfile\fP as the password for
-simple authentication.
+Use complete contents of \fIpasswdfile\fP, including any leading or
+trailing whitespace and any final newlines, as the password for
+simple authentication.  If the password does not contain a newline,
+be careful when creating this file.  Many editors and commands like
+\fBecho\fP will add a trailing newline, which will then be taken as part
+of the password.
 .TP
 .BI \-H \ ldapuri
 Specify URI(s) referring to the ldap server(s); only the protocol/host/port