Ticket #28: feedtrash.patch

File feedtrash.patch, 2.8 KB (added by eagle, 12 years ago)

Patch against INN 2.2.2

Line 
1diff -c -r1.1.1.3 -r1.1.1.3.2.1
2*** include/innconf.h   2000/02/28 19:34:10     1.1.1.3
3--- include/innconf.h   2000/03/20 06:58:22     1.1.1.3.2.1
4***************
5*** 320,326 ****
6      { _CONF_NNRPPERLAUTH,                     "",     2, 1 },
7  #define _CONF_NNRPDPOSTPORT                   "nnrpdpostport"
8  #define CONF_VAR_NNRPDPOSTPORT                        99
9!     { _CONF_NNRPDPOSTPORT,                    "",     2, 1 }
10  };
11! #define MAX_CONF_VAR 100
12 
13--- 320,329 ----
14      { _CONF_NNRPPERLAUTH,                     "",     2, 1 },
15  #define _CONF_NNRPDPOSTPORT                   "nnrpdpostport"
16  #define CONF_VAR_NNRPDPOSTPORT                        99
17!     { _CONF_NNRPDPOSTPORT,                    "",     2, 1 },
18! #define _CONF_FEEDTRASH                               "feedtrash"
19! #define CONF_VAR_FEEDTRASH                    100
20!     { _CONF_FEEDTRASH,                                "",     2, 0 }
21  };
22! #define MAX_CONF_VAR 101
23 
24
25diff -c -r1.1.1.4 -r1.1.1.4.2.1
26*** include/libinn.h    2000/02/28 19:38:24     1.1.1.4
27--- include/libinn.h    2000/03/20 06:58:22     1.1.1.4.2.1
28***************
29*** 100,105 ****
30--- 100,106 ----
31        int verifycancels;      /* Verify cancels against article author */
32        int logcancelcomm;      /* Log "ctlinnd cancel" commands to syslog? */
33        int wanttrash;          /* Put unwanted articles in 'junk' */
34+       int feedtrash;          /* Feed the junk group as though the groups really existed */
35        int remembertrash;      /* Put unwanted article ID's into history */
36        int linecountfuzz;      /* Check linecount and adjust of out by more */
37        int peertimeout;        /* How long peers can be inactive */
38
39diff -c -r1.1.1.5 -r1.1.1.5.2.3
40*** innd/art.c  2000/02/28 19:38:27     1.1.1.5
41--- innd/art.c  2000/03/22 05:51:44     1.1.1.5.2.3
42***************
43*** 2390,2395 ****
44--- 2450,2460 ----
45                 * would or would have had the group if it were created. */
46                ARTsendthegroup(*groups);
47                Accepted = TRUE;
48+           } else if (innconf->wanttrash && innconf->feedtrash) {
49+               /* dont set Accepted in this case, because we may still end
50+                * up filing the article in the junk group. */
51+               ARTsendthegroup(*groups);
52+               NonExist = TRUE;
53            } else
54                NonExist = TRUE;
55            ARTpoisongroup(*groups);
56
57diff -c -r1.1.1.4 -r1.1.1.4.2.1
58*** lib/getconfig.c     2000/02/28 19:36:58     1.1.1.4
59--- lib/getconfig.c     2000/03/20 06:58:24     1.1.1.4.2.1
60***************
61*** 193,198 ****
62--- 193,199 ----
63      innconf->verifycancels = FALSE;
64      innconf->logcancelcomm = FALSE;
65      innconf->wanttrash = FALSE;
66+     innconf->feedtrash = FALSE;
67      innconf->remembertrash = TRUE;
68      innconf->linecountfuzz = 0;
69      innconf->peertimeout = 1 * 60 * 60;
70***************
71*** 614,619 ****
72--- 615,625 ----
73                TEST_CONFIG(CONF_VAR_WANTTRASH, bit);
74                if (!bit && boolval != -1) innconf->wanttrash = boolval;
75                SET_CONFIG(CONF_VAR_WANTTRASH);
76+           } else
77+           if (EQ(ConfigBuff,_CONF_FEEDTRASH)) {
78+               TEST_CONFIG(CONF_VAR_FEEDTRASH, bit);
79+               if (!bit && boolval != -1) innconf->feedtrash = boolval;
80+               SET_CONFIG(CONF_VAR_FEEDTRASH);
81            } else
82            if (EQ(ConfigBuff,_CONF_REMEMBERTRASH)) {
83                TEST_CONFIG(CONF_VAR_REMEMBERTRASH, bit);