INN commit: branches/2.5 (CONTRIBUTORS innd/nc.c)

[INN Commit]

    Date: Sunday, January 1, 2012 @ 09:32:00
  Author: iulius
Revision: 9393

fix invalid 431 response when server is paused

When innd is paused, its 431 response code does not comply with
RFC 4644.  The Message-ID is missing.
It is now properly present as first argument to the response code.

Thanks to River Tarnell for the bug report.

Modified:
  branches/2.5/CONTRIBUTORS
  branches/2.5/innd/nc.c

--------------+
 CONTRIBUTORS |    2 +-
 innd/nc.c    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Modified: CONTRIBUTORS
===================================================================
--- CONTRIBUTORS	2012-01-01 17:31:24 UTC (rev 9392)
+++ CONTRIBUTORS	2012-01-01 17:32:00 UTC (rev 9393)
@@ -274,4 +274,4 @@
 S.P. Zeidler, Nix, Florian Schlichting, Torsten Jerzembeck, Harald Dunkel,
 Lars Magne Ingebrigtsen, Sam Varshavchik, Matthew Vernon, Ian Jackson,
 Edmund H. Ramm, Raphael Barrois, Bo Lindbergh, Matthias Meyser,
-Dennis Preiser, Paolo Amoroso, Dennis Davis
+Dennis Preiser, Paolo Amoroso, Dennis Davis, River Tarnell

Modified: innd/nc.c
===================================================================
--- innd/nc.c	2012-01-01 17:31:24 UTC (rev 9392)
+++ innd/nc.c	2012-01-01 17:32:00 UTC (rev 9393)
@@ -1827,7 +1827,8 @@
         return;
     } else if (Mode == OMpaused) {
         cp->Check_deferred++;
-        xasprintf(&buff, "%d %s", NNTP_FAIL_CHECK_DEFER, ModeReason);
+        xasprintf(&buff, "%d %s %s", NNTP_FAIL_CHECK_DEFER, cp->av[1],
+                  ModeReason);
         NCwritereply(cp, buff);
         free(buff);
         return;