rpms/cyrus-imapd
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fatal error when running "squatter -r user"

Browse Source 
Resolves: #2096149
This commit is contained in:
Martin Osvald 2022-08-17 14:18:02 +02:00
parent f0bebd7a6a
commit 2fbe17d56a
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cyrus-imapd-squatter-assert-crash.patch Normal file
View File

@ -0,0 +1,20 @@
diff --git a/imap/squatter.c b/imap/squatter.c
index 4419379..d00f003 100644
--- a/imap/squatter.c
+++ b/imap/squatter.c
@@ -408,8 +408,13 @@ static void expand_mboxnames(strarray_t *sa, int nmboxnames,
else {
/* Translate any separators in mailboxname */
char *intname = mboxname_from_external(mboxnames[i], &squat_namespace, NULL);
- int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
- mboxlist_mboxtree(intname, addmbox, sa, flags);
+ if (!intname || *intname == '\0') {
+ fprintf(stderr, "Mailbox %s: %s\n",
+ mboxnames[i], error_message(IMAP_MAILBOX_BADNAME));
+ } else {
+ int flags = recursive_flag ? 0 : MBOXTREE_SKIP_CHILDREN;
+ mboxlist_mboxtree(intname, addmbox, sa, flags);
+ }
free(intname);
}

9
cyrus-imapd.spec
View File

@ -14,7 +14,7 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 3.4.1 Version: 3.4.1
Release: 6%{?dist} Release: 7%{?dist}
%define ssl_pem_file_prefix /etc/pki/%name/%name %define ssl_pem_file_prefix /etc/pki/%name/%name
@ -57,6 +57,8 @@ Patch4: patch-cyrus-perl-linking
Patch5: cyrus-imapd-CVE-2021-33582.patch Patch5: cyrus-imapd-CVE-2021-33582.patch
Patch6: fix-broken-delivery-to-shared-mailboxes.patch Patch6: fix-broken-delivery-to-shared-mailboxes.patch
# https://github.com/cyrusimap/cyrus-imapd/pull/3892
Patch7: cyrus-imapd-squatter-assert-crash.patch
Source10: cyrus-imapd.logrotate Source10: cyrus-imapd.logrotate
Source11: cyrus-imapd.pam-config Source11: cyrus-imapd.pam-config
@ -662,6 +664,9 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
%changelog %changelog
* Wed Aug 17 2022 Martin Osvald <mosvald@redhat.com> - 3.4.1-7
- Resolves: #2096149 - Fatal error when running "squatter -r user"
* Wed Nov 24 2021 Martin Osvald <mosvald@redhat.com> - 3.4.1-6 * Wed Nov 24 2021 Martin Osvald <mosvald@redhat.com> - 3.4.1-6
- Sending email with /usr/lib/cyrus-imapd/deliver fails with code 75 - Sending email with /usr/lib/cyrus-imapd/deliver fails with code 75
- Resolves: #2021532 - Resolves: #2021532
@ -727,7 +732,7 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-5 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jan 12 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4 * Tue Jan 12 2021 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-4
- Drop clamav BR for eln - Drop clamav BR for eln
* Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3 * Mon Dec 14 2020 Pavel Zhukov <pzhukov@redhat.com> - 3.2.4-3