Attachment #122073 for bug #165176

View | Details | Raw Unified | Return to bug 165176
Collapse All | Expand All

Lines 6-13 Link Here

(-)/usr/ports/mail/dovecot2/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= dovecot	8	PORTNAME= dovecot
9	PORTVERSION= 2.0.16	9	PORTVERSION= 2.0.18
10	PORTREVISION= 1
11	CATEGORIES= mail ipv6	10	CATEGORIES= mail ipv6
12	MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/	11	MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/
13		12

Lines 1-2 Link Here

(-)/usr/ports/mail/dovecot2/distinfo (-2 / +2 lines)
1	SHA256 (dovecot-2.0.16.tar.gz) = a9652ce1f0767b9a4d4f613dd4d41bbe7b55c25728be6f1283dacf0aff62f057	1	SHA256 (dovecot-2.0.18.tar.gz) = 92fc68af6ef0309990c749fcab39eeebce56ea8888c3d73ba812b65a74d1fa1b
2	SIZE (dovecot-2.0.16.tar.gz) = 3317662	2	SIZE (dovecot-2.0.18.tar.gz) = 3353149




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);

Lines 6-12 Link Here

(-)/usr/ports/mail/dovecot2-pigeonhole/Makefile (-1 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= dovecot-pigeonhole	8	PORTNAME= dovecot-pigeonhole
9	PORTVERSION= 0.2.5	9	PORTVERSION= 0.2.6
10	CATEGORIES= mail	10	CATEGORIES= mail
11	MASTER_SITES= http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/	11	MASTER_SITES= http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
12	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}	12	DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}

Lines 1-2 Link Here

(-)/usr/ports/mail/dovecot2-pigeonhole/distinfo (-2 / +2 lines)
1	SHA256 (dovecot-2.0-pigeonhole-0.2.5.tar.gz) = 2793eec5384b9136774e1b3929864aa15edc5f057b97cfbee809ec0dfc292b9c	1	SHA256 (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = 49829e4aed763848b63b2bf9e288d4bc94020c924ce0621bc850e0a4bf4821ab
2	SIZE (dovecot-2.0-pigeonhole-0.2.5.tar.gz) = 1232117	2	SIZE (dovecot-2.0-pigeonhole-0.2.6.tar.gz) = 1234253

Return to bug 165176

Lines 1-22 Link Here

(-)/usr/ports/mail/dovecot2/files/patch-src-auth-passdb-vpopmail.c (-22 lines)
1	diff -r a8c2e04307c6 src/auth/passdb-vpopmail.c
2	--- src/auth/passdb-vpopmail.c Wed Nov 23 19:04:15 2011 +0200
3	+++ src/auth/passdb-vpopmail.c Fri Dec 02 23:39:55 2011 +0200
4	@@ -75,7 +75,8 @@
5	password = NULL;
6	*result_r = PASSDB_RESULT_USER_DISABLED;
7	} else {
8	- if (vpw->pw_clear_passwd != NULL) {
9	+ if (vpw->pw_clear_passwd != NULL &&
10	+ *vpw->pw_clear_passwd != '\0') {
11	password = t_strdup_noconst(vpw->pw_clear_passwd);
12	*cleartext = TRUE;
13	} else if (!*cleartext)
14	@@ -120,7 +121,7 @@
15	enum passdb_result result;
16	const char scheme, tmp_pass;
17	char *crypted_pass;
18	- bool cleartext;
19	+ bool cleartext = FALSE;
20	int ret;
21
22	crypted_pass = vpopmail_password_lookup(request, &cleartext, &result);