Request 2651 (superseded)

This request is superseded by request 2655 (Show diff)

Overview

Request 2651 (superseded)

added canonification patch for debian, added more package names to provides section

Created by dhoffend over 4 years ago
In state superseded
Superseded by 2655
Open review for Admin
Open review for vanmeeuwen

Submit cyrus-imapd

Submit package Kolab:Winterfell / cyrus-imapd to package Kolab:16 / cyrus-imapd

cyrus-imapd.spec Changed

@@ -18,9 +18,9 @@
 %global _cyrusgroup mail
 %global _cyrexecdir %{_exec_prefix}/lib/%{name}
 
-%global tag_version 2.5.17
-%global revision    34
-%global git_hash    3e2a85d6e
+%global tag_version 2.5.13
+%global revision    40
+%global git_hash    gef1af3ec3
 
 ##
 ## Options
@@ -63,6 +63,7 @@
 ##
 ## Patches
 ##
+Patch0003:          0003-Canonification-for-multiple-domains.patch
 
 BuildRoot:          %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -263,6 +264,10 @@
 sed -r -i -e 's/"berkeley(|-[a-z-]+)", //g' lib/imapoptions
 %endif
 
+%if 0%{?kolab_enterprise} < 1
+%patch0003 -p1
+%endif
+
 # only to update config.* files
 autoreconf -vi || (libtoolize --force && autoreconf -vi)
 
@@ -628,7 +633,7 @@
 %{_cyrexecdir}/cyr_deny
 %{_cyrexecdir}/cyr_df
 %{_cyrexecdir}/cyr_info
-#%%{_cyrexecdir}/ctl_conversationsdb
+#%{_cyrexecdir}/ctl_conversationsdb
 %{_cyrexecdir}/ctl_cyrusdb
 %{_cyrexecdir}/ctl_deliver
 %{_cyrexecdir}/ctl_mboxlist
@@ -649,7 +654,7 @@
 %{_cyrexecdir}/fixsearchpath.pl
 %{_cyrexecdir}/fud
 %exclude %{_cyrexecdir}/git-version.sh
-#%%{_cyrexecdir}/hammer_cyrusdb
+#%{_cyrexecdir}/hammer_cyrusdb
 %{_cyrexecdir}/imapd
 %{_cyrexecdir}/ipurge
 %exclude %{_cyrexecdir}/jenkins-build.sh
@@ -659,7 +664,7 @@
 %{_cyrexecdir}/mbexamine
 %{_cyrexecdir}/mbpath
 %{_cyrexecdir}/mbtool
-#%%{_cyrexecdir}/message_test
+#%{_cyrexecdir}/message_test
 %{_cyrexecdir}/migrate-metadata
 %{_cyrexecdir}/mkimap
 %{_cyrexecdir}/mknewsgroups
@@ -668,11 +673,11 @@
 %{_cyrexecdir}/quota
 %{_cyrexecdir}/reconstruct
 %{_cyrexecdir}/rehash
-#%%{_cyrexecdir}/search_test
+#%{_cyrexecdir}/search_test
 %{_cyrexecdir}/sievec
 %{_cyrexecdir}/sieved
 %{_cyrexecdir}/smmapd
-#%%{_cyrexecdir}/squat_dump
+#%{_cyrexecdir}/squat_dump
 %{_cyrexecdir}/squatter
 %{_cyrexecdir}/timsieved
 %{_cyrexecdir}/tls_prune
@@ -742,18 +747,14 @@
 
 %files devel
 %defattr(0644,root,root,0755)
+%files devel
+%defattr(0644,root,root,0755)
 %{_includedir}/cyrus
 %{_libdir}/pkgconfig/*cyrus*.pc
 %{_libdir}/*.so
 %{_libdir}/*.la
 
 %changelog
-* Wed Jul 28 2021 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.17.34-1
-- Check in 34 revisions ahead of upstream 2.5.17 release
-
-* Wed Jan 29 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 2.5.15.28-1
-- Fix MessageExpunge event notification when executed from system
-
 * Tue Oct 29 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.40-1
 - Include the user or group ID in failed login attempts

0003-Canonification-for-multiple-domains.patch Added

@@ -0,0 +1,62 @@
+--- a/ptclient/ldap.c	2019-01-02 14:44:17.000000000 +0100
++++ b/ptclient/ldap.c	2019-03-12 22:13:34.207770974 +0100
+@@ -933,7 +933,58 @@
+         if (rc != PTSM_OK)
+             return rc;
+ 
+-	if (ptsm->domain_base_dn && (strrchr(canon_id, '@') != NULL)) {
++        if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') == NULL)) {
++            syslog(LOG_DEBUG, "collecting all domains from %s", ptsm->domain_base_dn);
++
++            snprintf(domain_filter, sizeof(domain_filter), ptsm->domain_filter, "*");
++
++            syslog(LOG_DEBUG, "Domain filter: %s", domain_filter);
++
++            rc = ldap_search_st(ptsm->ld, ptsm->domain_base_dn, ptsm->domain_scope, domain_filter, domain_attrs, 0, &(ptsm->timeout), &res);
++
++            if (rc != LDAP_SUCCESS) {
++                if (rc == LDAP_SERVER_DOWN) {
++                    syslog(LOG_ERR, "LDAP not available: %s", ldap_err2string(rc));
++                    ldap_unbind(ptsm->ld);
++                    ptsm->ld = NULL;
++                    return PTSM_RETRY;
++                }
++
++                syslog(LOG_ERR, "LDAP search for domain failed: %s", ldap_err2string(rc));
++                return PTSM_FAIL;
++            }
++            if (ldap_count_entries(ptsm->ld, res) < 1) {
++                syslog(LOG_ERR, "No domain found");
++                return PTSM_FAIL;
++            } else if (ldap_count_entries(ptsm->ld, res) >= 1) {
++                int count_matches = 0;
++                char *temp_base = NULL;
++                LDAPMessage *res2;
++                for (entry = ldap_first_entry(ptsm->ld, res); entry != NULL; entry = ldap_next_entry(ptsm->ld, entry)) {
++                    if ((vals = ldap_get_values(ptsm->ld, entry, ptsm->domain_name_attribute)) != NULL) {
++                        syslog(LOG_DEBUG, "we have a domain %s", vals[0]);
++                        ptsmodule_standard_root_dn(vals[0], (const char **) &temp_base);
++                        rc = ldap_search_st(ptsm->ld, temp_base, ptsm->scope, filter, attrs, 0, &(ptsm->timeout), &res2);
++                        if (rc == LDAP_SUCCESS && ldap_count_entries(ptsm->ld, res2) == 1) {
++                            syslog(LOG_DEBUG, "Found %s in %s", canon_id, temp_base);
++                            base = temp_base;
++                            count_matches++;
++                        }
++                    }
++                }
++
++                if (count_matches > 1) {
++                    syslog(LOG_ERR, "LDAP search for %s failed because it matches multiple accounts.", canon_id);
++                    return PTSM_FAIL;
++                } else if (count_matches == 0) {
++                    syslog(LOG_ERR, "LDAP search for %s failed because it does not match any account in all domains.", canon_id);
++                    return PTSM_FAIL;
++                }
++
++                syslog(LOG_DEBUG, "we have found %s in %s", canon_id, base);
++            }
++        }
++        else if (ptsm->domain_base_dn && ptsm->domain_base_dn[0] != '\0' && (strrchr(canon_id, '@') != NULL)) {
+ 	    syslog(LOG_DEBUG, "Attempting to get domain for %s from %s", canon_id, ptsm->domain_base_dn);
+ 
+ 	    /* Get the base dn to search from domain_base_dn searched on domain_scope with