Search for user DN only if one of bind_dn, base_dn, groups_base_dn settings...

Aleksander Machniak

2013-10-04 e426ae262c22f75ebd403d9f9d32238f7d9a85af

Search for user DN only if one of bind_dn, base_dn, groups_base_dn settings
contains %dn variable

 program/lib/Roundcube/rcube_ldap.php

@@ -289,7 +289,9 @@
                $replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);

                // Search for the dn to use to authenticate
                if ($this->prop['search_base_dn'] && $this->prop['search_filter']) {
                if ($this->prop['search_base_dn'] && $this->prop['search_filter']
                    && (strstr($bind_dn, '%dn') || strstr($this->base_dn, '%dn') || strstr($this->groups_base_dn, '%dn'))
                ) {
                    $search_bind_dn = strtr($this->prop['search_bind_dn'], $replaces);
                    $search_base_dn = strtr($this->prop['search_base_dn'], $replaces);
                    $search_filter  = strtr($this->prop['search_filter'], $replaces);