If you are a liberal democrat, Sarah Palin is smarter than you.

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index f7e5cb3e6db6e8bad534cc3dbd9010e5ebc8686b..8b86178270ff7ece54f7d253271b33ef31b8ee7b 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -99,7 +99,6 @@ int is_valid_newsgroup_name(char *name) {
 }
 
 
-
 //
 // Convert a Citadel room name to a valid newsgroup name
 //
@@ -195,9 +194,7 @@ void nntp_greeting(void)
                return;
        }
 
-       // Note: the FQDN *must* appear as the first thing after the 220 code.
-       // Some clients (including citmail.c) depend on it being there.
-       //
+       // Display the standard greeting
        cprintf("200 %s NNTP Citadel server is not finished yet\r\n", config.c_fqdn);
 }
 
@@ -214,7 +211,6 @@ void nntps_greeting(void) {
 }
 
 
-
 //
 // implements the STARTTLS command
 //
@@ -271,7 +267,6 @@ void nntp_cleanup(void)
 }
 
 
-
 //
 // Implements the AUTHINFO USER command (RFC 4643)
 //
@@ -323,7 +318,6 @@ void nntp_authinfo_pass(const char *buf)
 }
 
 
-
 //
 // Implements the AUTHINFO extension (RFC 4643) in USER/PASS mode
 //
@@ -365,20 +359,6 @@ struct nntp_msglist nntp_fetch_msglist(struct ctdlroom *qrbuf) {
 }
 
 
-
-//
-// Various output formats for the LIST commands
-//
-enum {
-       NNTP_LIST_ACTIVE,
-       NNTP_LIST_ACTIVE_TIMES,
-       NNTP_LIST_DISTRIB_PATS,
-       NNTP_LIST_HEADERS,
-       NNTP_LIST_NEWSGROUPS,
-       NNTP_LIST_OVERVIEW_FMT
-};
-
-
 //
 // Output a room name (newsgroup name) in formats required for LIST and NEWGROUPS command
 //
@@ -419,7 +399,6 @@ void output_roomname_in_list_format(struct ctdlroom *qrbuf, int which_format, ch
 }
 
 
-
 //
 // Called once per room by nntp_newgroups() to qualify and possibly output a single room
 //
@@ -684,7 +663,6 @@ void nntp_mode(const char *cmd) {
 }
 
 
-
 //
 // Implements the ARTICLE, HEAD, BODY, and STAT commands.
 // (These commands all accept the same parameters; they differ only in how they output the retrieved message.)

diff --git a/citadel/modules/nntp/serv_nntp.h b/citadel/modules/nntp/serv_nntp.h
index 686416b2015ae4db59eb587b53ab2e1bb06feba5..672dd6779089cf1454f1df32dd4979e2222b382d 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.h
+++ b/citadel/modules/nntp/serv_nntp.h
@@ -36,10 +36,23 @@ struct listgroup_range {
 };
 
 
-
 typedef struct _citnntp {              // Information about the current session
        long current_article_number;
 } citnntp;
 
+
+//
+// Various output formats for the LIST commands
+//
+enum {
+       NNTP_LIST_ACTIVE,
+       NNTP_LIST_ACTIVE_TIMES,
+       NNTP_LIST_DISTRIB_PATS,
+       NNTP_LIST_HEADERS,
+       NNTP_LIST_NEWSGROUPS,
+       NNTP_LIST_OVERVIEW_FMT
+};
+
+
 int wildmat(const char *text, const char *p);