--- qmail-smtpd.c.orig  Tue Dec 19 02:29:46 2006
+++ qmail-smtpd.c       Tue Dec 19 02:31:33 2006
@@ -26,7 +26,6 @@
 #include "wait.h"
 #include "fd.h"
 
-#define AUTHCRAM
 #define MAXHOPS 100
 unsigned int databytes = 0;
 int timeout = 1200;
@@ -288,9 +287,14 @@
 #endif
 #else
 #ifdef TLS
-  out("\r\n250-AUTH LOGIN PLAIN");
-  out("\r\n250-AUTH=LOGIN PLAIN");
-  if (!ssl) out("\r\n250-STARTTLS");
+  if(ssl) {
+   out("\r\n250-AUTH LOGIN PLAIN");
+   out("\r\n250-AUTH=LOGIN PLAIN");
+  }
+  else
+  }
+   out("\r\n250-STARTTLS");
+  }
 #else
   out("\r\n250-AUTH LOGIN PLAIN");
   out("\r\n250-AUTH=LOGIN PLAIN");