41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
|
From 73af8e19546f235f6286cc9147a3ea74bde19ebb Mon Sep 17 00:00:00 2001
|
||
|
From: Ken Murchison <murch@fastmail.com>
|
||
|
Date: Mon, 5 Mar 2018 15:46:01 -0500
|
||
|
Subject: [PATCH] lmtp_sieve.c: sieve scripts are stores WITHOUT '.' -> '^'
|
||
|
translation
|
||
|
|
||
|
---
|
||
|
imap/lmtp_sieve.c | 12 +-----------
|
||
|
1 file changed, 1 insertion(+), 11 deletions(-)
|
||
|
|
||
|
diff --git a/imap/lmtp_sieve.c b/imap/lmtp_sieve.c
|
||
|
index f09ddcefa..af1b3feb8 100644
|
||
|
--- a/imap/lmtp_sieve.c
|
||
|
+++ b/imap/lmtp_sieve.c
|
||
|
@@ -1586,13 +1586,6 @@ sieve_interp_t *setup_sieve(struct sieve_interp_ctx *ctx)
|
||
|
return interp;
|
||
|
}
|
||
|
|
||
|
-static void _rm_dots(char *p)
|
||
|
-{
|
||
|
- for (; *p; p++) {
|
||
|
- if (*p == '.') *p = '^';
|
||
|
- }
|
||
|
-}
|
||
|
-
|
||
|
static int sieve_find_script(const char *user, const char *domain,
|
||
|
const char *script, char *fname, size_t size)
|
||
|
{
|
||
|
@@ -1629,10 +1622,7 @@ static int sieve_find_script(const char *user, const char *domain,
|
||
|
}
|
||
|
else {
|
||
|
char hash = (char) dir_hash_c(user, config_fulldirhash);
|
||
|
- char *usercopy = xstrdup(user); // stupid hashing of names, we SHOULD just allow dots on disk
|
||
|
- _rm_dots(usercopy);
|
||
|
- len += snprintf(fname+len, size-len, "/%c/%s/", hash, usercopy);
|
||
|
- free(usercopy);
|
||
|
+ len += snprintf(fname+len, size-len, "/%c/%s/", hash, user);
|
||
|
|
||
|
if (!script) { /* default script */
|
||
|
char *bc_fname;
|