1 files changed, 22 insertions, 1 deletions

diff --git a/qmail-smtpd.c b/qmail-smtpd.c
index 35630ac..db0e16b 100644
--- a/qmail-smtpd.c
+++ b/qmail-smtpd.c
@@ -29,6 +29,10 @@
 #include "cdb.h"
 #include "qmail-spp.h"
 #include "dns.h"
+#include "base64.h"
+#include "open.h"
+#include "fd.h"
+#include "fork.h"
 
 int spp_val;
 
@@ -511,6 +515,7 @@ stralloc mailfrom = {0};
 stralloc rcptto = {0};
 stralloc fuser = {0};
 stralloc mfparms = {0};
+int smtputf8 = 0;
 int recipcount;
 
 int mailfrom_size(arg) char *arg;
@@ -562,6 +567,9 @@ void mailfrom_parms(arg) char *arg;
       while (len) {
         arg++; len--; 
         if (*arg == ' ' || *arg == '\0' ) {
+#ifdef SMTPUTF8
+           if (case_starts(mfparms.s,"SMTPUTF8")) smtputf8 = 1;
+#endif
            if (case_starts(mfparms.s,"SIZE=")) if (mailfrom_size(mfparms.s+5)) { flagsize = 1; return; }
            if (case_starts(mfparms.s,"AUTH=")) mailfrom_auth(mfparms.s+5,mfparms.len-5);  
            if (!stralloc_copys(&mfparms,"")) die_nomem;
@@ -596,7 +604,11 @@ void smtp_ehlo(arg) char *arg;
   if (!ssl && (stat(servercert, &st) == 0))
     out("\r\n250-STARTTLS");
 #endif
+#ifdef SMTPUTF8
+  out("\r\n250-PIPELINING\r\n250-SMTPUTF8\r\n250-8BITMIME\r\n");
+#else
   out("\r\n250-PIPELINING\r\n250-8BITMIME\r\n");
+#endif
 #if defined(TLS)
   if(!tls_before_auth || (tls_before_auth && ssl)) smtp_authout();
 #else
@@ -827,7 +839,16 @@ void smtp_data(arg) char *arg; {
   if (qmail_open(&qqt) == -1) { err_qqt(); return; }
   qp = qmail_qp(&qqt);
   out("354 go ahead\r\n");
- 
+
+  if (smtputf8) {
+    stralloc utf8proto = {0};
+    if (*protocol == 'E') ++protocol;
+    if (!stralloc_copys(&utf8proto, "UTF8")) die_nomem();
+    if (!stralloc_cats(&utf8proto, protocol)) die_nomem();
+    if (!stralloc_0(&utf8proto)) die_nomem();
+    protocol = utf8proto.s;
+  }
+
   received(&qqt,protocol,local,remoteip,remotehost,remoteinfo,fakehelo);
   qmail_put(&qqt,sppheaders.s,sppheaders.len); /* set in qmail-spp.c */
   spp_rset();