2 commits - lib/api lib/ext lib/kolab_api_service.php

[Jeroen van Meeuwen]

 lib/api/kolab_api_service_domain_types.php |    5 +++++
 lib/ext/Net/LDAP3.php                      |    3 +++
 lib/kolab_api_service.php                  |    7 +++++++
 3 files changed, 15 insertions(+)

New commits:
commit cfde2f6f2f455a9ffa33cdbb979ab6fb247d4bfc
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jun 12 12:29:06 2013 +0200

    Should the base_dn not be specified, fall back to the configured root_dn

diff --git a/lib/ext/Net/LDAP3.php b/lib/ext/Net/LDAP3.php
index 9355869..63bc757 100644
--- a/lib/ext/Net/LDAP3.php
+++ b/lib/ext/Net/LDAP3.php
@@ -571,6 +571,9 @@ class Net_LDAP3
         if (!$entry_dn) {
             $entry_dn = $this->config_get("base_dn");
         }
+        if (!$entry_dn) {
+            $entry_dn = $this->config_get("root_dn");
+        }
 
         $this->_debug("effective_rights for subject $subject resolves to entry dn $entry_dn");
 


commit b07bf9637ae7c5e15f959629757c08f14711b84a
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jun 12 12:27:32 2013 +0200

    Add the ability to define the inetdomainstatus for pending confirmation of ownership by registrants/customers

diff --git a/lib/api/kolab_api_service_domain_types.php b/lib/api/kolab_api_service_domain_types.php
index a84cf82..397ca1b 100644
--- a/lib/api/kolab_api_service_domain_types.php
+++ b/lib/api/kolab_api_service_domain_types.php
@@ -67,11 +67,16 @@ class kolab_api_service_domain_types extends kolab_api_service
                         'inetdomainbasedn' => array(
                             'optional' => 'true',
                         ),
+                        'inetdomainstatus' => array(
+                            'type' => 'checkbox',
+                            'optional' => true,
+                        ),
                     ),
                     'fields' => array(
                         'objectclass' => array(
                             'top',
                             'domainrelatedobject',
+                            'inetdomain',
                         ),
                     ),
                 ),
diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php
index 53878b5..4cc526a 100644
--- a/lib/kolab_api_service.php
+++ b/lib/kolab_api_service.php
@@ -90,11 +90,18 @@ abstract class kolab_api_service
                         'associateddomain' => array(
                             'type' => 'list'
                         ),
+                        'inetdomainbasedn' => array(
+                            'optional' => true,
+                        ),
+                        'inetdomainstatus' => array(
+                            'optional' => true,
+                        ),
                     ),
                     'fields' => array(
                         'objectclass' => array(
                             'top',
                             'domainrelatedobject',
+                            'inetdomain',
                         ),
                     ),
                 );