INN commit: branches/2.5 (include/nntp.h innd/nc.c)

[INN Commit]

    Date: Sunday, November 15, 2009 @ 01:17:43
  Author: iulius
Revision: 8752

Improve the greeting message and say we are in transit mode
with innd.

Modified:
  branches/2.5/include/nntp.h
  branches/2.5/innd/nc.c

----------------+
 include/nntp.h |    1 -
 innd/nc.c      |    8 +++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: include/nntp.h
===================================================================
--- include/nntp.h	2009-11-15 09:17:31 UTC (rev 8751)
+++ include/nntp.h	2009-11-15 09:17:43 UTC (rev 8752)
@@ -30,7 +30,6 @@
 #define NNTP_HAVEIT_BADID		"435 Bad Message-ID"
 #define NNTP_LIST_FOLLOWS		"215"
 #define NNTP_ARTICLE_FOLLOWS		"220"
-#define NNTP_POSTOK			"200"
 #define NNTP_REJECTIT_EMPTY		"437 Empty article"
 #define NNTP_RESENDIT_LATER             "436 Retry later"
 #define NNTP_POSTEDOK			"240 Article posted"

Modified: innd/nc.c
===================================================================
--- innd/nc.c	2009-11-15 09:17:31 UTC (rev 8751)
+++ innd/nc.c	2009-11-15 09:17:43 UTC (rev 8752)
@@ -1360,13 +1360,15 @@
     char		*p;
     char		buff[SMBUF];
 
-    /* Set the greeting message. */
+    /* Set the greeting message.  We always send 200 because we cannot know
+     * for sure that the client will not be able to use POST during its
+     * entire session. */
     p = innconf->pathhost;
     if (p == NULL)
 	/* Worked in main, now it fails?  Curious. */
 	p = Path.data;
-    snprintf(buff, sizeof(buff), "%d %s InterNetNews server %s ready",
-	    NNTP_OK_BANNER_POST, p, INN_VERSION_STRING);
+    snprintf(buff, sizeof(buff), "%d %s InterNetNews server %s ready (transit mode)",
+             NNTP_OK_BANNER_POST, p, INN_VERSION_STRING);
     NCgreeting = xstrdup(buff);
 }