From: Côme Bernigaud <mcmic@php.net>
Date: Mon, 6 Jul 2015 12:28:01 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta1~12^2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a09dcb0e13b809a8d8c646aff8449782d3b9ca18;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated README, added test to create LDAP base if missing and ease tests
---

a09dcb0e13b809a8d8c646aff8449782d3b9ca18
diff --cc ext/ldap/tests/README
index b30043abce,4ac4d10b67..4f3b07d6cd
--- a/ext/ldap/tests/README
+++ b/ext/ldap/tests/README
@@@ -8,9 -8,12 +8,12 @@@ Notes
  1.  A self signed certificate can be generated using:
      $ openssl req -newkey rsa:1024 -x509 -nodes -out server.pem -keyout server.pem -days 3650
      It is used for testing ldap_start_tls(), which also requires "TLS_REQCERT never" in client configuration
- 2.  An empty LDAP structure is required for the tests to be PASSed
+ 2.  An empty LDAP structure is required for the tests to be PASSed (except for base and admin)
+ 
+ If you use a debian based distribution, prefer the use of dpkg-reconfigure.
+ Otherwise you may alter these configuration files:
  
 -(/etc/openldap/)slapd.conf:
 +	(/etc/openldap/)slapd.conf:
  -----------------------------------------------------------
  TLSCACertificateFile /etc/openldap/ssl/server.pem
  TLSCertificateFile /etc/openldap/ssl/server.pem