Projects
Kolab:16:Enterprise
kolab-webadmin
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 14
View file
kolab-webadmin.spec
Changed
@@ -35,7 +35,7 @@ Name: kolab-webadmin Version: 3.2.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kolab Groupware Server Web Administration Interface License: AGPLv3+ Group: Productivity/Office/Organizers @@ -43,6 +43,10 @@ Source0: https://mirror.kolabenterprise.com/pub/releases/%{name}-%{version}.tar.gz +Patch0: 0001-T5647-Fix-kolab-admin-role-created-in-wrong-base_dn-.patch +Patch1: 0002-Fixed-T5653-and-support-domain_edit-in-hosted-mode.patch +Patch2: 0003-check-for-mail-address-is-already-in-use.patch + BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -88,6 +92,10 @@ fi done +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 + %build %install @@ -163,6 +171,9 @@ %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* Sun Dec 22 2019 Daniel Hoffend <dh@dotlan.net> - 3.2.15-2 +- Adding hotfixes for domain creation/edit in hosted mode + * Mon Oct 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 3.2.15-1 - Release 3.2.15
View file
0001-T5647-Fix-kolab-admin-role-created-in-wrong-base_dn-.patch
Added
@@ -0,0 +1,28 @@ +From ea2522021505627c7955b7cafe939799ef429086 Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Fri, 8 Nov 2019 07:50:18 +0000 +Subject: PATCH 1/3 T5647: Fix kolab-admin role created in wrong base_dn for + hosted domains + +--- + lib/kolab_api_service.php | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/kolab_api_service.php b/lib/kolab_api_service.php +index c098de1..6390b3c 100644 +--- a/lib/kolab_api_service.php ++++ b/lib/kolab_api_service.php +@@ -415,8 +415,8 @@ abstract class kolab_api_service + } + } + +- // OU's parent attribute +- if ($object_name == 'ou' && !empty($attribs'base_dn')) { ++ // Support base_dn attribute ++ if ($object_name != 'domain' && !empty($attribs'base_dn')) { + // @TODO: validate? + $result'base_dn' = $attribs'base_dn'; + } +-- +2.20.1 +
View file
0002-Fixed-T5653-and-support-domain_edit-in-hosted-mode.patch
Added
@@ -0,0 +1,41 @@ +From 4ad311ebb6c1d98dae302617a5a9c4dd66219179 Mon Sep 17 00:00:00 2001 +From: Daniel Hoffend <dh@dotlan.net> +Date: Tue, 26 Nov 2019 09:22:47 +0100 +Subject: PATCH 2/3 Fixed T5653 and support domain_edit in hosted mode + +Summary: +This patch fixed the domain_edit api call in hosted mode. The Bug is +described in T5653 + +Reviewers: #web_administration_panel_developers, vanmeeuwen + +Reviewed By: #web_administration_panel_developers, vanmeeuwen + +Subscribers: vanmeeuwen + +Tags: #web_administration_panel + +Differential Revision: https://git.kolab.org/D835 +--- + lib/Auth/LDAP.php | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php +index 4bf2a8f..aac6df8 100644 +--- a/lib/Auth/LDAP.php ++++ b/lib/Auth/LDAP.php +@@ -396,6 +396,11 @@ class LDAP extends Net_LDAP3 { + return false; + } + ++ // remove invalid/hidden attributes ++ if (isset($attributes'domainrelatedobject_only')) { ++ unset($attributes'domainrelatedobject_only'); ++ } ++ + $domain_dn = key($domain); + + // We should start throwing stuff over the fence here. +-- +2.20.1 +
View file
0003-check-for-mail-address-is-already-in-use.patch
Added
@@ -0,0 +1,39 @@ +From fa1ff0c3a21bbceeca674858b72c9391187d3d74 Mon Sep 17 00:00:00 2001 +From: Daniel Hoffend <dh@dotlan.net> +Date: Tue, 26 Nov 2019 09:29:53 +0100 +Subject: PATCH 3/3 check for mail address is already in use + +Summary: This fixes issue T5704 + +Reviewers: #web_administration_panel_developers, vanmeeuwen + +Reviewed By: #web_administration_panel_developers, vanmeeuwen + +Subscribers: vanmeeuwen + +Maniphest Tasks: T5704 + +Differential Revision: https://git.kolab.org/D883 +--- + lib/api/kolab_api_service_form_value.php | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php +index 58799f6..2edee57 100644 +--- a/lib/api/kolab_api_service_form_value.php ++++ b/lib/api/kolab_api_service_form_value.php +@@ -1276,6 +1276,11 @@ class kolab_api_service_form_value extends kolab_api_service + } + } + ++ // Check if addresses are not already in use ++ if ($validation_type == self::VALIDATE_EXTENDED) { ++ $this->_email_addresses_in_use($value, 'mail', $postdata); ++ } ++ + return 'OK'; + } + +-- +2.20.1 +
View file
debian.changelog
Changed
@@ -1,3 +1,10 @@ +kolab-webadmin (3.2.15-0~kolab3) unstable; urgency=low + + * Fixed T5653 and support domain_edit in hosted mode + * T5647: Fix kolab-admin role created in wrong base_dn for hosted domains + + -- Daniel Hoffend <dh@dotlan.net> Sat, 16 Nov 2019 00:02:00 +0100 + kolab-webadmin (3.2.15-0~kolab2) unstable; urgency=low * Release 3.2.15
View file
debian.series
Changed
@@ -0,0 +1,4 @@ +0001-T5647-Fix-kolab-admin-role-created-in-wrong-base_dn-.patch -p1 +0002-Fixed-T5653-and-support-domain_edit-in-hosted-mode.patch -p1 +0003-check-for-mail-address-is-already-in-use.patch -p1 +
View file
kolab-webadmin.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-webadmin Binary: kolab-webadmin Architecture: all -Version: 3.2.15-0~kolab2 +Version: 3.2.15-0~kolab3 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/
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
.