From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 30 23:20:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 42F0416A43A for ; Mon, 30 Jan 2006 23:20:23 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 0FC4B43D6D for ; Mon, 30 Jan 2006 23:20:11 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k0UNKBOb001051 for ; Mon, 30 Jan 2006 23:20:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k0UNKBiN001050; Mon, 30 Jan 2006 23:20:11 GMT (envelope-from gnats) Resent-Date: Mon, 30 Jan 2006 23:20:11 GMT Resent-Message-Id: <200601302320.k0UNKBiN001050@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Cristiano Deana Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B75D416A420 for ; Mon, 30 Jan 2006 23:15:16 +0000 (GMT) (envelope-from cris@deana.it) Received: from mail.deana.it (bsd.deana.it [62.123.205.227]) by mx1.FreeBSD.org (Postfix) with ESMTP id A80BF43D70 for ; Mon, 30 Jan 2006 23:15:14 +0000 (GMT) (envelope-from cris@deana.it) Received: (qmail 17437 invoked by uid 89); 31 Jan 2006 00:15:13 +0100 Received: from unknown (HELO deana.it) (62.123.205.228) by mail.deana.it with SMTP; 31 Jan 2006 00:15:13 +0100 Received: (qmail 24381 invoked by uid 1001); 30 Jan 2006 23:15:25 -0000 Message-Id: <20060130231525.24380.qmail@deana.it> Date: 30 Jan 2006 23:15:25 -0000 From: Cristiano Deana To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: garga@FreeBSD.org Subject: ports/92574: mail/qmail-tls tls+auth doesn't work X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Jan 2006 23:20:25 -0000 >Number: 92574 >Category: ports >Synopsis: mail/qmail-tls tls+auth doesn't work >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Jan 30 23:20:09 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Cristiano Deana >Release: FreeBSD 6.0-STABLE i386 >Organization: G.U.F.I. >Environment: System: FreeBSD bsd.deana.it 6.0-STABLE FreeBSD 6.0-STABLE #2: Thu Jan 19 18:42:33 CET 2006 root@casa.deana.it:/usr/obj/usr/src/sys/CASA i386 >Description: ports mail/qmail-tls doesn't works correctly: after 'ehlo' command smtpd should reply with 250-STARTTLS only in a line, not with 250-STARTTLS AUTH LOGIN PLAIN >How-To-Repeat: cd /usr/ports/mail/qmail-tls choose smtp-auth option, then try to use auth with TLS, client doesn't understand 'STARTTLS' smtpd reply. >Fix: Patch the patch of the patch! --- qmail-tls.patch begins here --- --- qmail/files/auth.patch.patch-tls.orig Mon Jan 30 23:53:48 2006 +++ qmail/files/auth.patch.patch-tls Mon Jan 30 23:45:31 2006 @@ -35,7 +35,7 @@ socket.lib` qmail-smtpd.0: \ -@@ -174,30 +176,38 @@ +@@ -174,30 +176,40 @@ stralloc greeting = {0}; *************** @@ -55,7 +55,7 @@ - void smtp_rset() ---- 241,255 ---- - } -+--- 277,298 ---- ++--- 277,300 ---- void smtp_ehlo(arg) char *arg; { -! smtp_greet("250-"); @@ -63,16 +63,18 @@ + smtp_greet("250-"); ++ #ifdef AUTHCRAM + #ifdef TLS -+! if (!ssl) out("\r\n250-STARTTLS AUTH LOGIN CRAM-MD5 PLAIN"); -+! if (!ssl) out("\r\n250-STARTTLS AUTH=LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ++! if (!ssl) out("\r\n250-STARTTLS"); +! #else ! out("\r\n250-AUTH LOGIN CRAM-MD5 PLAIN"); ! out("\r\n250-AUTH=LOGIN CRAM-MD5 PLAIN"); +! #endif +! #else +! #ifdef TLS -+! if (!ssl) out("\r\n250-STARTTLS AUTH LOGIN PLAIN"); -+! if (!ssl) out("\r\n250-STARTTLS AUTH=LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-AUTH LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-AUTH=LOGIN PLAIN"); ++! if (!ssl) out("\r\n250-STARTTLS"); ! #else ! out("\r\n250-AUTH LOGIN PLAIN"); ! out("\r\n250-AUTH=LOGIN PLAIN"); --- qmail-tls.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: