diff --git a/roundcubemail/program/lib/Roundcube/rcube_ldap.php b/roundcubemail/program/lib/Roundcube/rcube_ldap.php index 6778d9b..abccfc2 100644 --- a/roundcubemail/program/lib/Roundcube/rcube_ldap.php +++ b/roundcubemail/program/lib/Roundcube/rcube_ldap.php @@ -285,6 +285,7 @@ class rcube_ldap extends rcube_addressbook $bind_pass = $this->prop['bind_pass']; $bind_user = $this->prop['bind_user']; $bind_dn = $this->prop['bind_dn']; + $auth_method = $this->prop['auth_method']; $this->base_dn = $this->prop['base_dn']; $this->groups_base_dn = $this->prop['groups']['base_dn'] ?: $this->base_dn; @@ -420,10 +421,12 @@ class rcube_ldap extends rcube_addressbook } } - if (empty($bind_pass)) { + if (empty($bind_pass) and (strcmp($auth_method,GSSAPI) !== 0)) { $this->ready = true; } else { + if (!empty($_SERVER['KRB5CCNAME'])){ + putenv("KRB5CCNAME={$_SERVER['KRB5CCNAME']}");} if (!empty($bind_dn)) { $this->ready = $this->ldap->bind($bind_dn, $bind_pass); }