Commit d7485a64 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

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
Showing with 1 addition and 1 deletion
+1 -1
......@@ -952,7 +952,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(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment