summaryrefslogtreecommitdiff
path: root/mail/dovecot2
diff options
context:
space:
mode:
authorOliver Lehmann <oliver@FreeBSD.org>2011-12-02 22:33:12 +0000
committerOliver Lehmann <oliver@FreeBSD.org>2011-12-02 22:33:12 +0000
commit551259fe10c4ab6100b57a14bf4e799539841ad8 (patch)
treee6d30c25900ae5068e50f1481aa7952a39467c38 /mail/dovecot2
parentUpdate Open-Axiom to version 1.4.1. (diff)
fix vpopmail support
Approved by: maintainer Feature safe: yes
Notes
Notes: svn path=/head/; revision=286789
Diffstat (limited to 'mail/dovecot2')
-rw-r--r--mail/dovecot2/Makefile1
-rw-r--r--mail/dovecot2/files/patch-src-auth-passdb-vpopmail.c22
2 files changed, 23 insertions, 0 deletions
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index a29934ba4cc5..b5573f952f12 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dovecot
PORTVERSION= 2.0.16
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/
diff --git a/mail/dovecot2/files/patch-src-auth-passdb-vpopmail.c b/mail/dovecot2/files/patch-src-auth-passdb-vpopmail.c
new file mode 100644
index 000000000000..5829d1476f0e
--- /dev/null
+++ b/mail/dovecot2/files/patch-src-auth-passdb-vpopmail.c
@@ -0,0 +1,22 @@
+diff -r a8c2e04307c6 src/auth/passdb-vpopmail.c
+--- src/auth/passdb-vpopmail.c Wed Nov 23 19:04:15 2011 +0200
++++ src/auth/passdb-vpopmail.c Fri Dec 02 23:39:55 2011 +0200
+@@ -75,7 +75,8 @@
+ password = NULL;
+ *result_r = PASSDB_RESULT_USER_DISABLED;
+ } else {
+- if (vpw->pw_clear_passwd != NULL) {
++ if (vpw->pw_clear_passwd != NULL &&
++ *vpw->pw_clear_passwd != '\0') {
+ password = t_strdup_noconst(vpw->pw_clear_passwd);
+ *cleartext = TRUE;
+ } else if (!*cleartext)
+@@ -120,7 +121,7 @@
+ enum passdb_result result;
+ const char *scheme, *tmp_pass;
+ char *crypted_pass;
+- bool cleartext;
++ bool cleartext = FALSE;
+ int ret;
+
+ crypted_pass = vpopmail_password_lookup(request, &cleartext, &result);