Import from CS git

.cyrus-imapd.metadata

@@ -1,5 +1,3 @@
-b537ecfca22df8a41f53d07d88d9547a1cb63d7d SOURCES/CHANGES.rpm
-e39754f688d98ac0040df85e8850a2e330c6235d SOURCES/README.rpm
 b3157c127c9cc404ecb2672e0eb4f18cac2a2a73 SOURCES/cassandane-00bfe01.tar.gz
 fdbc28a259af65792e23ce8da16faf323039139c SOURCES/cassandane-testdata-20170523.tar.gz
 49e3f8bbecd391513b81e3ccf49ea2df84be522f SOURCES/cyrus-imapd-3.0.7.tar.gz

.gitignore

@@ -1,5 +1,3 @@
-SOURCES/CHANGES.rpm
-SOURCES/README.rpm
 SOURCES/cassandane-00bfe01.tar.gz
 SOURCES/cassandane-testdata-20170523.tar.gz
 SOURCES/cyrus-imapd-3.0.7.tar.gz

SOURCES/README.rpm

@@ -0,0 +1,34 @@
+---------------
+Cyrus IMAPd RPM
+---------------
+
+This is a _very_ 'quick and dirty' install howto.
+
+The following steps should lead you to a running Cyrus IMAP server:
+
+1)  Install on a distribution which is supported by this RPM. Don't install
+    on a dirty system, where you have previously installed from source.
+2)  Don't install if you have a previous Cyrus IMAPd installation <=2.1.x on
+    your box. Upgrading any Invoca rpm based installation should be fine.
+3)  Make sure you understand that this RPM installs in FHS compliant
+    directories, like /var/lib/imap and /var/spool/imap
+4)  Make sure cyrus-sasl is installed.
+5)  Make sure saslauthd is running. If not, edit /etc/sysconfig/saslauthd as
+    needed and do 'chkconfig saslauthd on ; service saslauthd start'
+6)  Install the cyrus-imapd RPMs.
+7)  If it's your first install of Cyrus IMAPd, then set a password for the
+    cyrus user in whatever database you are using to authenticate. When
+    using a local account, this should be 'passwd cyrus'.
+8)  Make sure your MTA delivers to Cyrus IMAPd, I recommend LMTP for this.
+9)  Start Cyrus IMAPd with 'service cyrus-imapd start'
+10) Run cyradm and create a user. Usually it's something like this:
+    'cyradm --user=cyrus --auth=login localhost'
+11) If you're using sendmail, be aware that cyrusv2.m4 included in standard
+    sendmail distribution uses socket /var/imap/socket/lmtp while this rpm
+    uses /var/lib/imap/socket/lmtp.
+12) Check your syslog configuration. This RPM uses the mail facility to log
+    messages. On busy sites you may want to limit the mail facility to the
+    info priority with something like 'mail.info    /var/log/maillog' in
+    /etc/syslog.conf.
+
+Enjoy!

SOURCES/patch-cyrus-ldap-group-retriaval

@@ -0,0 +1,32 @@
+commit 1152ce70af232fc4200bbeca18961f99e12d73df
+Author: Felix Schumacher <felix.schumacher@internetallee.de>
+Date:   Wed Feb 6 19:02:11 2019 +0100
+
+    Return correct group names when groups are resolved by filter
+    
+    This fixes an regression, that was introduced with 61f5296c0d727faee4726525a6812b200d946d83.
+    Back then the logic was changed from len(vals) != 1 to two if clauses len(vals) < 1 and len(vals) > 1
+    which logged errors and an else clause (which matched the correct number of len(val) == 1) that
+    got the old error handling code.
+
+diff --git a/ptclient/ldap.c b/ptclient/ldap.c
+index 40c9adee3..457951928 100644
+--- a/ptclient/ldap.c
++++ b/ptclient/ldap.c
+@@ -1336,11 +1336,15 @@ static int ptsmodule_make_authstate_filter(
+             syslog(LOG_ERR, "No values for attribute '%s' on entry '%s'",
+                             ptsm->member_attribute,
+                             errdn);
++            *reply = "no values";
++            rc = PTSM_FAIL;
++            ldap_value_free(vals);
++            vals = NULL;
++            goto done;
+         } else if (ldap_count_values(vals) > 1) {
+             syslog(LOG_ERR, "Too many values for attribute '%s' on entry '%s'",
+                             ptsm->member_attribute,
+                             errdn);
+-        } else {
+             *reply = "too many values";
+             rc = PTSM_FAIL;
+             ldap_value_free(vals);

SPECS/cyrus-imapd.spec

@@ -9,7 +9,7 @@
 
 Name: cyrus-imapd
 Version: 3.0.7
-Release: 26%{?dist}
+Release: 27%{?dist}
 
 %define ssl_pem_file_prefix /etc/pki/%name/%name
 
@@ -54,6 +54,8 @@ Patch13: cyrus-squatter-assert-crash.patch
 Patch14: cyrus-imapd-load-tombstones-for-cleanup.patch
 # https://github.com/cyrusimap/cyrus-imapd/commit/ed1a17b09e2e03788852e122f213b88352bc24b9
 Patch15: cyrus-imapd-ptclient-canonification_across_multiple_domains.patch
+# https://github.com/cyrusimap/cyrus-imapd/commit/1152ce70af232fc4200bbeca18961f99e12d73df
+Patch16: patch-cyrus-ldap-group-retriaval
 
 Source10: cyrus-imapd.logrotate
 Source11: cyrus-imapd.pam-config
@@ -691,6 +693,10 @@ getent passwd cyrus >/dev/null || /usr/sbin/useradd -c "Cyrus IMAP Server" -d /v
 
 
 %changelog
+* Tue Oct 29 2024 Martin Osvald <mosvald@redhat.com> - 3.0.7-27
+- Fix regression while retrieving ldap group names
+- Resolves: RHEL-61691
+
 * Mon Jul 01 2024 Martin Osvald <mosvald@redhat.com> - 3.0.7-26
 - Update fmf plans and gating for c8s