diff options
| -rw-r--r-- | qmail-smtpd.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/qmail-smtpd.c b/qmail-smtpd.c index 0ec6fe9..582a695 100644 --- a/qmail-smtpd.c +++ b/qmail-smtpd.c @@ -270,17 +270,8 @@ void smtp_helo(arg) char *arg; } void smtp_ehlo(arg) char *arg; { - smtp_greet("250-"); out("\r\n"); - if (hostname && childargs) { -#ifdef AUTHCRAM - out("250-AUTH LOGIN CRAM-MD5 PLAIN\r\n"); - out("250-AUTH=LOGIN CRAM-MD5 PLAIN\r\n"); -#else - out("250-AUTH LOGIN PLAIN\r\n"); - out("250-AUTH=LOGIN PLAIN\r\n"); -#endif - } - out("250-PIPELINING\r\n250 8BITMIME\r\n"); + smtp_greet("250-"); + out("\r\n250-PIPELINING\r\n250 8BITMIME\r\n"); seenmail = 0; dohelo(arg); } void smtp_rset(arg) char *arg; @@ -431,7 +422,7 @@ void smtp_data(arg) char *arg; { if (qmail_open(&qqt) == -1) { err_qqt(); return; } qp = qmail_qp(&qqt); out("354 go ahead\r\n"); - + received(&qqt,"SMTP",local,remoteip,remotehost,remoteinfo,fakehelo); blast(&hops); hops = (hops >= MAXHOPS); |