--- qmail-smtpd.c.orig	Mon Aug  4 23:10:13 1997
+++ qmail-smtpd.c	Tue Aug  5 02:28:35 1997
@@ -260,7 +260,7 @@
 void smtp_quit() { smtp_greet("221 "); out("\r\n"); die(); }
 void smtp_help() { out("214-qmail home page: http://pobox.com/~djb/qmail.html\r\n214 send comments to qmail@pobox.com\r\n"); }
 void err_syntax() { out("555 syntax error (#5.5.4)\r\n"); }
-void err_bmf() { out("553 sorry, your envelope sender is in my badmailfrom list (#5.7.1)\r\n"); }
+void err_bmf() { out("571 sorry, your envelope sender is in my badmailfrom list (#5.7.1)\r\n"); }
 void err_nogateway() { out("553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)\r\n"); }
 void err_unimpl() { out("502 unimplemented (#5.5.1)\r\n"); }
 void err_seenmail() { out("503 one MAIL per message (#5.5.1)\r\n"); }
@@ -281,6 +281,7 @@
  if (!arg) { err_syntax(); return; }
  if (!addrparse(arg)) { err_syntax(); return; }
  bmfcheck();
+ if (flagbarf) { err_bmf(); return; }
  seenmail = 1; out("250 ok\r\n");
  if (!stralloc_copys(&rcptto,"")) outofmem();
  if (!stralloc_copys(&mailfrom,addr.s)) outofmem();
@@ -289,7 +290,6 @@
  if (!seenmail) { err_wantmail(); return; }
  if (!arg) { err_syntax(); return; }
  if (!addrparse(arg)) { err_syntax(); return; }
- if (flagbarf) { err_bmf(); return; }
  if (relayclient)
   {
    --addr.len;