From 66d90e538153a9a84f4943c08de78a46ce584eae Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Wed, 11 Nov 2009 17:38:29 +0100
Subject: [PATCH] Subaddress extension: now uses Dovecot's recipient_delimiter
setting in stead of its own sieve_subaddress_sep setting.
---
.../plugins/subaddress/ext-subaddress.c | 32 +++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/lib-sieve/plugins/subaddress/ext-subaddress.c b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
index 367b11f3e..d7f714b3e 100644
--- a/src/lib-sieve/plugins/subaddress/ext-subaddress.c
+++ b/src/lib-sieve/plugins/subaddress/ext-subaddress.c
@@ -29,10 +29,10 @@
* Configuration
*/
-#define SUBADDRESS_DEFAULT_SEP "+"
+#define SUBADDRESS_DEFAULT_DELIM "+"
struct ext_subaddress_config {
- char *separator;
+ char *delimiter;
};
/*
@@ -69,13 +69,13 @@ static bool ext_subaddress_load
(const struct sieve_extension *ext, void **context)
{
struct ext_subaddress_config *config;
- const char *sep = sieve_get_setting(ext->svinst, "sieve_subaddress_sep");
+ const char *delim = sieve_get_setting(ext->svinst, "recipient_delimiter");
- if ( sep == NULL )
- sep = SUBADDRESS_DEFAULT_SEP;
+ if ( delim == NULL )
+ delim = SUBADDRESS_DEFAULT_DELIM;
config = i_new(struct ext_subaddress_config, 1);
- config->separator = i_strdup(sep);
+ config->delimiter = i_strdup(delim);
*context = (void *) config;
@@ -88,7 +88,7 @@ static void ext_subaddress_unload
struct ext_subaddress_config *config =
(struct ext_subaddress_config *) ext->context;
- i_free(config->separator);
+ i_free(config->delimiter);
i_free(config);
}
@@ -136,13 +136,13 @@ static const char *subaddress_user_extract_from
{
struct ext_subaddress_config *config =
(struct ext_subaddress_config *) addrp->object.ext->context;
- const char *sep;
+ const char *delim;
- sep = strstr(address->local_part, config->separator);
+ delim = strstr(address->local_part, config->delimiter);
- if ( sep == NULL ) return address->local_part;
+ if ( delim == NULL ) return address->local_part;
- return t_strdup_until(address->local_part, sep);
+ return t_strdup_until(address->local_part, delim);
}
static const char *subaddress_detail_extract_from
@@ -150,18 +150,18 @@ static const char *subaddress_detail_extract_from
{
struct ext_subaddress_config *config =
(struct ext_subaddress_config *) addrp->object.ext->context;
- const char *sep;
+ const char *delim;
- if ( (sep=strstr(address->local_part, config->separator)) == NULL )
+ if ( (delim=strstr(address->local_part, config->delimiter)) == NULL )
return NULL;
- sep += strlen(config->separator);
+ delim += strlen(config->delimiter);
/* Just to be sure */
- if ( sep > (address->local_part + strlen(address->local_part)) )
+ if ( delim > (address->local_part + strlen(address->local_part)) )
return NULL;
- return sep;
+ return delim;
}
/*
--
GitLab