aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-09-30 15:55:46 +0200
committerJohannes Berg <johannes@sipsolutions.net>2007-09-30 15:55:46 +0200
commit2e9f97299ee15034513623f55c60efa5dccbff32 (patch)
tree890fdf71263334438d550b4c2f262d37b8d8c980
parent6ee873226fd4878cca1bc72bb9cca3fa1d866cb7 (diff)
downloaddovecot-antispam-2e9f97299ee15034513623f55c60efa5dccbff32.tar.gz
dovecot-antispam-2e9f97299ee15034513623f55c60efa5dccbff32.tar.xz
dovecot-antispam-2e9f97299ee15034513623f55c60efa5dccbff32.zip
grammar fix
-rw-r--r--Makefile2
-rw-r--r--plugin.c10
-rw-r--r--plugin.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 691835f..ba032ab 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ CFLAGS += -I$(DOVECOT)/src/imap/
# per-backend configuration
ifeq ("$(BACKEND)", "dspam-exec")
-CFLAGS += -DBACKEND_WANT_SIGNATURE=1
+CFLAGS += -DBACKEND_WANTS_SIGNATURE=1
# can take a while, check more often
CFLAGS += -DCOPY_CHECK_INTERVAL=10
endif
diff --git a/plugin.c b/plugin.c
index 944c446..02c4a4c 100644
--- a/plugin.c
+++ b/plugin.c
@@ -43,7 +43,7 @@ static char *default_spam_folders[] = {
NULL
};
static char **spam_folders = default_spam_folders;
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
static char *signature_hdr = "X-DSPAM-Signature";
#endif
@@ -109,7 +109,7 @@ static int fetch_and_copy(struct client *client,
int ret;
/* MODIFIED: new variables */
pool_t pool = pool_alloconly_create("antispam-copy-pool", 1024);
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
const char *signature;
struct strlist *siglist = NULL;
#else
@@ -132,7 +132,7 @@ static int fetch_and_copy(struct client *client,
client_send_sendalive_if_needed(client);
/* MODIFIED: keep track of mail as we copy */
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
signature = mail_get_first_header(mail, signature_hdr);
if (is_empty_str(signature)) {
ret = SIGNATURE_MISSING;
@@ -161,7 +161,7 @@ static int fetch_and_copy(struct client *client,
ret = -1;
/* MODIFIED: pass to backend */
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
/* got all signatures now, pass them to backend if no errors */
if (ret == 0) {
ret = backend(pool, src_spam, siglist);
@@ -339,7 +339,7 @@ void antispam_init(void)
} else
debug("antispam: no spam folders\n");
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
tmp = getenv("ANTISPAM_SIGNATURE");
if (tmp)
signature_hdr = tmp;
diff --git a/plugin.h b/plugin.h
index 99126eb..c2281ad 100644
--- a/plugin.h
+++ b/plugin.h
@@ -10,7 +10,7 @@ struct strlist {
const char *str;
};
-#ifdef BACKEND_WANT_SIGNATURE
+#ifdef BACKEND_WANTS_SIGNATURE
/*
* Call backend giving
* - pool: dovecot memory pool, will be freed afterwards