LIST OVERVIEW.FMT

[citadel.git] / citadel / modules / nntp / serv_nntp.c

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index 26b0ccd4f9a7bc55e22846353e7d0800d15a4fba..78043d3fa12eb5f8a85b7a45709e57b545be2e67 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -238,6 +238,7 @@ void nntp_capabilities(void)
        cprintf("READER\r\n");
        cprintf("MODE-READER\r\n");
        cprintf("LIST ACTIVE NEWSGROUPS\r\n");
+       cprintf("OVER\r\n");
 #ifdef HAVE_OPENSSL
        cprintf("STARTTLS\r\n");
 #endif
@@ -509,11 +510,30 @@ void nntp_list(const char *cmd) {
        else if (!strcasecmp(list_format, "NEWSGROUPS")) {
                nld.list_format = NNTP_LIST_NEWSGROUPS;
        }
+       else if (!strcasecmp(list_format, "OVERVIEW.FMT")) {
+               nld.list_format = NNTP_LIST_OVERVIEW_FMT;
+       }
        else {
                cprintf("501 syntax error , unsupported list format\r\n");
                return;
        }
 
+       // OVERVIEW.FMT delivers a completely different type of data than all of the
+       // other LIST commands.  It's a stupid place to put it.  But that's how it's
+       // written into RFC3977, so we have to handle it here.
+       if (nld.list_format == NNTP_LIST_OVERVIEW_FMT) {
+               cprintf("215 Order of fields in overview database.\r\n");
+               cprintf("Subject:\r\n");
+               cprintf("From:\r\n");
+               cprintf("Date:\r\n");
+               cprintf("Message-ID:\r\n");
+               cprintf("References:\r\n");
+               cprintf(":bytes\r\n");
+               cprintf(":lines\r\n");
+               cprintf(".\r\n");
+               return;
+       }
+
        cprintf("215 list of newsgroups follows\r\n");
        CtdlGetUser(&CC->user, CC->curr_user);
        CtdlForEachRoom(nntp_list_backend, &nld);
@@ -1034,7 +1054,11 @@ void nntp_command_loop(void)
                nntp_last_next(ChrPtr(Cmd));
        }
 
-       else if (!strcasecmp(cmdname, "xover")) {
+       else if (
+                       (!strcasecmp(cmdname, "xover"))
+                       || (!strcasecmp(cmdname, "over"))
+               )
+       {
                nntp_xover(ChrPtr(Cmd));
        }