ports/92574: mail/qmail-tls tls+auth doesn't work

[Cristiano Deana]

>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 at 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: