Projects
Kolab:16:Enterprise
kolab-autoconf
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 6
View file
kolab-autoconf.spec
Changed
@@ -23,7 +23,7 @@ %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name} Name: kolab-autoconf -Version: 0.2 +Version: 1.3 Release: 1%{?dist} Summary: Autodiscovery for clients of Kolab Groupware @@ -69,6 +69,9 @@ %attr(0750,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* Mon Oct 9 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.3-1 +- Release version 1.3 + * Tue Sep 26 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.2-1 - Release of version 0.2
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-autoconf (1.3-1) unstable; urgency=medium + + * Release of version 1.3. + + -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Mon, 9 Oct 2017 16:24:02 +0100 + kolab-autoconf (0.2-1) unstable; urgency=medium * Release of version 0.2.
View file
kolab-autoconf-0.2.tar.gz/lib/Autodiscover.php -> kolab-autoconf-1.3.tar.gz/lib/Autodiscover.php
Changed
@@ -172,7 +172,7 @@ $this->ldap(); // find domain - if (!($domain = $this->find_domain($domain))) { + if (!$this->ldap->find_domain($domain)) { $this->error("Unknown domain"); } @@ -211,6 +211,9 @@ 'hosts' => array($this->_ldap_server), 'port' => $this->_ldap_port, 'use_tls' => $this->_ldap_scheme == 'tls', + 'domain_base_dn' => $this->conf->get('ldap', 'domain_base_dn'), + 'domain_filter' => $this->conf->get('ldap', 'domain_filter'), + 'domain_name_attribute' => $this->conf->get('ldap', 'domain_name_attribute'), )); $this->_ldap_domain = $this->conf->get('primary_domain'); @@ -227,43 +230,6 @@ } /** - * Find domain by name - */ - private function find_domain($domain) - { - $ckey = 'domain::' . $domain; -/* - // use memcache - if ($domain = $this->get_cache_data($ckey)) { - return $domain; - } -*/ - $domain_base_dn = $this->conf->get('ldap', 'domain_base_dn'); - $domain_filter = $this->conf->get('ldap', 'domain_filter'); - $domain_name_attribute = $this->conf->get('ldap', 'domain_name_attribute'); - - if (empty($domain_name_attribute)) { - $domain_name_attribute = 'associateddomain'; - } - - $name_filter = $domain_name_attribute . "=" . Net_LDAP3::quote_string($domain); - $domain_filter = "(&" . $domain_filter . "(" . $name_filter . "))"; - - if ($result = $this->ldap->search($domain_base_dn, $domain_filter, 'sub', array($domain_name_attribute))) { - $result = $result->entries(true); - - // root domain - $domain = current($result); - $domain = current((array)$domain$domain_name_attribute); -/* - // cache domain DN - $this->set_cache_data($ckey, $domain); -*/ - return $domain; - } - } - - /** * Find user in LDAP */ private function find_user($email, $domain) @@ -292,7 +258,7 @@ ); $filter = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter); - $base_dn = 'dc=' . implode(',dc=', explode('.', $domain)); + $base_dn = $this->ldap->domain_root_dn($domain); $result = $this->ldap->search($base_dn, $filter, 'sub', array_values($attributes));
View file
kolab-autoconf.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-autoconf Binary: kolab-autoconf Architecture: all -Version: 0.2-1 +Version: 1.3-1 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Tobias Brunner <tobias.brunner@vshn.ch> Homepage: http://www.kolab.org/ @@ -13,5 +13,5 @@ Package-List: kolab-autoconf deb admin extra Files: - 00000000000000000000000000000000 0 kolab-autoconf-0.2.tar.gz + 00000000000000000000000000000000 0 kolab-autoconf-1.3.tar.gz 00000000000000000000000000000000 0 debian.tar.gz
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.