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

- ignore user_denny.db if missing (#553011)

Browse Source 
- fix location of certificates in default imapd.conf
This commit is contained in:
Michal Hlavinka 2010-01-14 13:08:38 +00:00
parent 9d4d82ba9c
commit ad76e47fcf
3 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cyrus-imapd-2.3.16-nodenny.patch Normal file
View File

@ -0,0 +1,26 @@
diff -up cyrus-imapd-2.3.16/imap/global.c.nodenny cyrus-imapd-2.3.16/imap/global.c
--- cyrus-imapd-2.3.16/imap/global.c.nodenny 2009-10-13 17:10:36.000000000 +0200
+++ cyrus-imapd-2.3.16/imap/global.c 2010-01-14 14:00:10.455808186 +0100
@@ -542,14 +542,22 @@ static int acl_ok(const char *user, stru
int access_ok(const char *user, const char *service, char *msgbuf, int size)
{
static char *fname = NULL;
+ static int nodb = 0;
struct db *db = NULL;
int r, ret = 1; /* access always granted by default */
+ if (nodb) return ret;
+
if (!fname) {
+ struct stat s;
/* create path to database */
fname = xmalloc(strlen(config_dir) + sizeof(FNAME_USERDENYDB) + 1);
strcpy(fname, config_dir);
strcat(fname, FNAME_USERDENYDB);
+ if (stat(fname, &s) == -1 && errno==ENOENT) {
+ nodb = 1;
+ return ret;
+ }
}
/* try to open database */

6
cyrus-imapd.imap-2.3.x-conf
View File

@ -6,6 +6,6 @@ sendmail: /usr/sbin/sendmail
hashimapspool: true hashimapspool: true
sasl_pwcheck_method: saslauthd sasl_pwcheck_method: saslauthd
sasl_mech_list: PLAIN sasl_mech_list: PLAIN
tls_cert_file: /usr/share/ssl/certs/cyrus-imapd.pem tls_cert_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
tls_key_file: /usr/share/ssl/certs/cyrus-imapd.pem tls_key_file: /etc/pki/cyrus-imapd/cyrus-imapd.pem
tls_ca_file: /usr/share/ssl/certs/ca-bundle.crt tls_ca_file: /etc/pki/tls/certs/ca-bundle.crt

10
cyrus-imapd.spec
View File

@ -2,7 +2,7 @@
Name: cyrus-imapd Name: cyrus-imapd
Version: 2.3.16 Version: 2.3.16
Release: 1%{?dist} Release: 2%{?dist}
%define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem %define ssl_pem_file %{_sysconfdir}/pki/%{name}/%{name}.pem
@ -59,6 +59,9 @@ Patch18: cyrus-imapd-2.3.7-krb4.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=461875 # https://bugzilla.redhat.com/show_bug.cgi?id=461875
Patch19: cyrus-imapd-2.3.12p2-current-db.patch Patch19: cyrus-imapd-2.3.12p2-current-db.patch
# workaround, rhbz#553011
Patch20: cyrus-imapd-2.3.16-nodenny.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: autoconf BuildRequires: autoconf
@ -147,6 +150,7 @@ one running the server.
%patch15 -p1 -b .make_md5_defaults %patch15 -p1 -b .make_md5_defaults
%patch18 -p1 -b .krb4 %patch18 -p1 -b .krb4
%patch19 -p1 -b .db4.7 %patch19 -p1 -b .db4.7
%patch20 -p1 -b .nodenny
# add additional sources # add additional sources
mkdir doc/{m4,contrib} mkdir doc/{m4,contrib}
@ -513,6 +517,10 @@ fi
%{_mandir}/man1/* %{_mandir}/man1/*
%changelog %changelog
* Thu Jan 14 2010 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-2
- ignore user_denny.db if missing (#553011)
- fix location of certificates in default imapd.conf
* Tue Dec 22 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-1 * Tue Dec 22 2009 Michal Hlavinka <mhlavink@redhat.com> - 2.3.16-1
- updated to 2.3.16 - updated to 2.3.16