com php-src: Merge branch 'PHP-5.6': ext/ldap/tests/README
| From: | Côme Bernigaud | Date: | Mon, 06 Jul 2015 12:28:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/ldap/tests/README | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87759@lists.php.net to get a copy of this message | ||
Commit: a09dcb0e13b809a8d8c646aff8449782d3b9ca18
Author: Côme Bernigaud <mcmic@php.net> Mon, 6 Jul 2015 14:28:01 +0200
Parents: 535b2cc02bbaf5684c4619303661a367fe8663f7 42f7e4c0445f3492396e05db4996cbdce362c73e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a09dcb0e13b809a8d8c646aff8449782d3b9ca18
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated README, added test to create LDAP base if missing and ease tests
Changed paths:
MM ext/ldap/tests/README
Diff:
diff --cc ext/ldap/tests/README
index b30043a,4ac4d10..4f3b07d
--- 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