From fb02bbb42c29a0970b049d20f54eeff159b4a974 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Mon, 30 Apr 2018 15:51:39 +0200
Subject: [PATCH] Merge branch
'5824-ldif-generation-does-not-respect-tls-setting' into '1.3-dev'
Resolve "LDIF generation does not respect STARTTLS setting"
See merge request fusiondirectory/fd!251
(cherry picked from commit d7485a64eb63d98b5f80f9d73735852e75abd5dd)
d9f45f54 :ambulance: fix(ldap) Use STARTTLS in LDIF export if needed
---
include/class_ldap.inc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/class_ldap.inc b/include/class_ldap.inc
index 2a55657e1..ad80c8c91 100644
--- a/include/class_ldap.inc
+++ b/include/class_ldap.inc
@@ -985,7 +985,7 @@ class LDAP
$admin = escapeshellarg($this->binddn);
$filter = escapeshellarg($filter);
- $cmd = "ldapsearch -x -LLLL -D {$admin} {$filter} {$limit} {$scope} -H {$host} -b {$dn} -w {$pwd} ";
+ $cmd = 'ldapsearch'.($this->tls ? ' -ZZ' : '')." -x -LLLL -D {$admin} {$filter} {$limit} {$scope} -H {$host} -b {$dn} -w {$pwd} ";
// Create list of process pipes
$descriptorspec = array(
--
GitLab