1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
|
--- bozohttpd.c.orig 2021-02-28 05:20:51 UTC
+++ bozohttpd.c
@@ -240,7 +240,7 @@ bozo_set_pref(bozohttpd_t *httpd, bozoprefs_t *bozopre
}
static void
-bozo_clear_prefs(bozohttpd_t *httpd, bozoprefs_t *prefs)
+bozo_clear_prefs(bozoprefs_t *prefs)
{
size_t i;
@@ -2197,22 +2197,22 @@ http_errors_long(int code)
return (help);
}
-#ifndef NO_BLOCKLIST_SUPPORT
-static struct blocklist *blstate;
+#ifndef NO_BLACKLIST_SUPPORT
+static struct blacklist *blstate;
void
pfilter_notify(const int what, const int code)
{
if (blstate == NULL)
- blstate = blocklist_open();
+ blstate = blacklist_open();
if (blstate == NULL)
return;
- (void)blocklist_r(blstate, what, 0, http_errors_short(code));
+ (void)blacklist_r(blstate, what, 0, http_errors_short(code));
}
-#endif /* !NO_BLOCKLIST_SUPPORT */
+#endif /* !NO_BLACKLIST_SUPPORT */
/* the follow functions and variables are used in handling HTTP errors */
int
@@ -2317,18 +2317,18 @@ bozo_http_error(bozohttpd_t *httpd, int code, bozo_htt
bozo_printf(httpd, "%s", httpd->errorbuf);
bozo_flush(httpd, stdout);
-#ifndef NO_BLOCKLIST_SUPPORT
+#ifndef NO_BLACKLIST_SUPPORT
switch(code) {
case 401:
- pfilter_notify(BLOCKLIST_AUTH_FAIL, code);
+ pfilter_notify(BLACKLIST_AUTH_FAIL, code);
break;
case 403:
- pfilter_notify(BLOCKLIST_ABUSIVE_BEHAVIOR, code);
+ pfilter_notify(BLACKLIST_ABUSIVE_BEHAVIOR, code);
break;
}
-#endif /* !NO_BLOCKLIST_SUPPORT */
+#endif /* !NO_BLACKLIST_SUPPORT */
return code;
}
@@ -2714,7 +2714,7 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs_t *prefs, con
void
bozo_cleanup(bozohttpd_t *httpd, bozoprefs_t *prefs)
{
- bozo_clear_prefs(httpd, prefs);
+ bozo_clear_prefs(prefs);
free(httpd->virthostname);
free(httpd->errorbuf);
|
