INN commit: trunk/nnrpd (article.c group.c)

INN Commit Russ_Allbery at isc.org
Sun Aug 31 14:53:14 UTC 2008


    Date: Sunday, August 31, 2008 @ 07:53:13
  Author: iulius
Revision: 7993

If listgroup fails, it must not have changed the selected newsgroup.

Modified:
  trunk/nnrpd/article.c
  trunk/nnrpd/group.c

-----------+
 article.c |    6 ------
 group.c   |   22 ++++++++++------------
 2 files changed, 10 insertions(+), 18 deletions(-)

Modified: article.c
===================================================================
--- article.c	2008-08-31 14:44:40 UTC (rev 7992)
+++ article.c	2008-08-31 14:53:13 UTC (rev 7993)
@@ -775,12 +775,6 @@
     bool                dashfound = false;
 
     *DidReply = false;
-    /* Check whether a newsgroup has been selected. */
-    if (GRPcount == 0) {
-	Reply("%s\r\n", ARTnotingroup);
-	*DidReply = true;
-	return false;
-    }
 
     if (ac == 1) {
 	/* No argument, do only current article. */

Modified: group.c
===================================================================
--- group.c	2008-08-31 14:44:40 UTC (rev 7992)
+++ group.c	2008-08-31 14:53:13 UTC (rev 7993)
@@ -166,18 +166,6 @@
         ARTRANGE range;
         bool DidReply;
 
-        /* We already know that the group exists. */
-        GRPcount++;
-        ARTnumber = ARTlow;
-        if (GRPcur) {
-            if (strcmp(GRPcur, group) != 0) {
-                OVctl(OVCACHEFREE, &boolval);
-                free(GRPcur);
-                GRPcur = xstrdup(group);
-            }
-        } else
-                GRPcur = xstrdup(group);
-
         /* Parse the range. */
         if (ac == 3) {
             /* CMDgetrange() expects av[1] to contain the range.
@@ -216,6 +204,16 @@
             }
             Printf(".\r\n");
         }
+        GRPcount++;
+        ARTnumber = ARTlow;
+        if (GRPcur) {
+            if (strcmp(GRPcur, group) != 0) {
+                OVctl(OVCACHEFREE, &boolval);
+                free(GRPcur);
+                GRPcur = xstrdup(group);
+            }
+        } else
+            GRPcur = xstrdup(group);
     }
     free(group);
 }



More information about the inn-committers mailing list