From 4e4ab8c161feb9893167d59a316d4fbfcc864e79 Mon Sep 17 00:00:00 2001 From: Christoph Michael Becker Date: Thu, 6 Oct 2016 09:59:35 +0000 Subject: [PATCH] Adds documentation for recently added LDAP constants. -- Provided by anonymous 73901 (Chad.Sikorra@gmail.com) git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@340331 c90b9560-bf6c-de11-be94-00142212c4b1 --- reference/ldap/constants.xml | 181 +++++++++++++++++++ reference/ldap/functions/ldap-get-option.xml | 75 ++++++++ reference/ldap/functions/ldap-set-option.xml | 75 ++++++++ 3 files changed, 331 insertions(+) diff --git a/reference/ldap/constants.xml b/reference/ldap/constants.xml index f50b839071..64dbf8b83c 100644 --- a/reference/ldap/constants.xml +++ b/reference/ldap/constants.xml @@ -177,6 +177,17 @@ + + + LDAP_OPT_DIAGNOSTIC_MESSAGE + (integer) + + + + + + + LDAP_OPT_MATCHED_DN @@ -221,6 +232,176 @@ + + + LDAP_OPT_X_KEEPALIVE_IDLE + (integer) + + + + Specifies the number of seconds a connection needs to remain idle before TCP starts sending keepalive probes. + + + + + + LDAP_OPT_X_KEEPALIVE_PROBES + (integer) + + + + Specifies the maximum number of keepalive probes TCP should send before dropping the connection. + + + + + + LDAP_OPT_X_KEEPALIVE_INTERVAL + (integer) + + + + Specifies the interval in seconds between individual keepalive probes. + + + + + + LDAP_OPT_X_TLS_CACERTDIR + (string) + + + + Specifies the path of the directory containing CA certificates. + + + + + + LDAP_OPT_X_TLS_CACERTFILE + (string) + + + + Specifies the full-path of the CA certificate file. + + + + + + LDAP_OPT_X_TLS_CERTFILE + (string) + + + + Specifies the full-path of the certificate file. + + + + + + LDAP_OPT_X_TLS_CIPHER_SUITE + (string) + + + + Specifies the allowed cipher suite. + + + + + + LDAP_OPT_X_TLS_CRL_CHECK + (integer) + + + + Specifies the CRL evaluation strategy. This must be one of: LDAP_OPT_X_TLS_CRL_NONE,LDAP_OPT_X_TLS_CRL_PEER, LDAP_OPT_X_TLS_CRL_ALL. + + + + This option is only valid for OpenSSL. + + + + + + + LDAP_OPT_X_TLS_CRLFILE + (string) + + + + Specifies the full-path of the CRL file. + + + + This option is only valid for GnuTLS. + + + + + + + LDAP_OPT_X_TLS_DHFILE + (string) + + + + Specifies the full-path of the file containing the parameters for Diffie-Hellman ephemeral key exchange. + + + + This option is ignored by GnuTLS and Mozilla NSS. + + + + + + + LDAP_OPT_X_TLS_KEYFILE + (string) + + + + Specifies the full-path of the certificate key file. + + + + + + LDAP_OPT_X_TLS_PROTOCOL_MIN + (integer) + + + + Specifies the minimum protocol version. This can be one of: LDAP_OPT_X_TLS_PROTOCOL_SSL2,LDAP_OPT_X_TLS_PROTOCOL_SSL3, LDAP_OPT_X_TLS_PROTOCOL_TLS1_0, LDAP_OPT_X_TLS_PROTOCOL_TLS1_1, LDAP_OPT_X_TLS_PROTOCOL_TLS1_2 + + + + + + LDAP_OPT_X_TLS_RANDOM_FILE + (string) + + + + + + + + + + LDAP_OPT_X_TLS_REQUIRE_CERT + (integer) + + + + Specifies the certificate checking checking strategy. This must be one of: LDAP_OPT_X_TLS_NEVER,LDAP_OPT_X_TLS_HARD, LDAP_OPT_X_TLS_DEMAND, +LDAP_OPT_X_TLS_ALLOW, LDAP_OPT_X_TLS_TRY. + + + GSLC_SSL_NO_AUTH diff --git a/reference/ldap/functions/ldap-get-option.xml b/reference/ldap/functions/ldap-get-option.xml index 885a6e4d18..dea323ff8a 100644 --- a/reference/ldap/functions/ldap-get-option.xml +++ b/reference/ldap/functions/ldap-get-option.xml @@ -97,6 +97,81 @@ LDAP_OPT_CLIENT_CONTROLS array + + LDAP_OPT_X_KEEPALIVE_IDLE + int + + + + LDAP_OPT_X_KEEPALIVE_PROBES + int + + + + LDAP_OPT_X_KEEPALIVE_INTERVAL + int + + + + LDAP_OPT_X_TLS_CACERTDIR + string + + + + LDAP_OPT_X_TLS_CACERTFILE + string + + + + LDAP_OPT_X_TLS_CERTFILE + string + + + + LDAP_OPT_X_TLS_CIPHER_SUITE + string + + + + LDAP_OPT_X_TLS_CRLCHECK + integer + + + + LDAP_OPT_X_TLS_CRLFILE + string + + + + LDAP_OPT_X_TLS_DHFILE + string + + + + LDAP_OPT_X_TLS_KEYILE + string + + + + LDAP_OPT_X_TLS_PACKAGE + string + + + + LDAP_OPT_X_TLS_PROTOCOL_MIN + integer + + + + LDAP_OPT_X_TLS_RANDOM_FILE + string + + + + LDAP_OPT_X_TLS_REQUIRE_CERT + integer + + diff --git a/reference/ldap/functions/ldap-set-option.xml b/reference/ldap/functions/ldap-set-option.xml index c5b0b0465a..09710ad74f 100644 --- a/reference/ldap/functions/ldap-set-option.xml +++ b/reference/ldap/functions/ldap-set-option.xml @@ -96,6 +96,11 @@ string + + LDAP_OPT_DIAGNOSTIC_MESSAGE + string + + LDAP_OPT_MATCHED_DN string @@ -111,6 +116,76 @@ array + + LDAP_OPT_X_KEEPALIVE_IDLE + int + + + + LDAP_OPT_X_KEEPALIVE_PROBES + int + + + + LDAP_OPT_X_KEEPALIVE_INTERVAL + int + + + + LDAP_OPT_X_TLS_CACERTDIR + string + + + + LDAP_OPT_X_TLS_CACERTFILE + string + + + + LDAP_OPT_X_TLS_CERTFILE + string + + + + LDAP_OPT_X_TLS_CIPHER_SUITE + string + + + + LDAP_OPT_X_TLS_CRLCHECK + integer + + + + LDAP_OPT_X_TLS_CRLFILE + string + + + + LDAP_OPT_X_TLS_DHFILE + string + + + + LDAP_OPT_X_TLS_KEYILE + string + + + + LDAP_OPT_X_TLS_PROTOCOL_MIN + integer + + + + LDAP_OPT_X_TLS_RANDOM_FILE + string + + + + LDAP_OPT_X_TLS_REQUIRE_CERT + integer + +