Request 2143 (accepted)

You're not reviewing the full diff of request 2143 , but the diff to the superseded request 2142 (Show full diff)

Overview

Request 2143 (accepted)

Check in version 1.3

Created by vanmeeuwen about 7 years ago
In state accepted
Supersedes 2142
Open review for Admin

Submit kolab-autoconf

Submit package Kolab:Winterfell / kolab-autoconf to package Kolab:16 / kolab-autoconf

kolab-autoconf.spec Changed

debian.changelog Changed

kolab-autoconf-0.3.tar.gz/lib/Autodiscover.php -> kolab-autoconf-0.2.tar.gz/lib/Autodiscover.php Changed

@@ -172,7 +172,7 @@
         $this->ldap();
 
         // find domain
-        if (!$this->ldap->find_domain($domain)) {
+        if (!($domain = $this->find_domain($domain))) {
             $this->error("Unknown domain");
         }
 
@@ -211,9 +211,6 @@
             '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');
@@ -230,6 +227,43 @@
     }
 
     /**
+     * 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)
@@ -258,7 +292,7 @@
         );
 
         $filter  = preg_replace(array_keys($replace_patterns), array_values($replace_patterns), $filter);
-        $base_dn = $this->ldap->domain_root_dn($domain);
+        $base_dn = 'dc=' . implode(',dc=', explode('.', $domain));
 
         $result = $this->ldap->search($base_dn, $filter, 'sub', array_values($attributes));

kolab-autoconf.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2143 0

Request History

vanmeeuwen created request about 7 years ago

Check in version 1.3

vanmeeuwen accepted review about 7 years ago

vanmeeuwen accepted request about 7 years ago

Please add a comment