Skip to content
Snippets Groups Projects
Commit 8091baf4 authored by Stephan Bosch's avatar Stephan Bosch
Browse files

lib-sieve: Changed sieve_extension_override() to use hash_table_update()...

lib-sieve: Changed sieve_extension_override() to use hash_table_update() rather than hash_table_insert().

Due to a Dovecot change this would now cause an assertion failure.
parent 5931b69e
No related branches found
No related tags found
No related merge requests found
...@@ -382,15 +382,6 @@ static struct sieve_extension *sieve_extension_lookup ...@@ -382,15 +382,6 @@ static struct sieve_extension *sieve_extension_lookup
return hash_table_lookup(ext_reg->extension_index, name); return hash_table_lookup(ext_reg->extension_index, name);
} }
static void sieve_extension_insert
(struct sieve_instance *svinst, const char *name,
struct sieve_extension *ext)
{
struct sieve_extension_registry *ext_reg = svinst->ext_reg;
hash_table_insert(ext_reg->extension_index, name, ext);
}
static struct sieve_extension *sieve_extension_alloc static struct sieve_extension *sieve_extension_alloc
(struct sieve_instance *svinst, (struct sieve_instance *svinst,
const struct sieve_extension_def *extdef) const struct sieve_extension_def *extdef)
...@@ -421,7 +412,8 @@ static struct sieve_extension *_sieve_extension_register ...@@ -421,7 +412,8 @@ static struct sieve_extension *_sieve_extension_register
/* Register extension if it is not registered already */ /* Register extension if it is not registered already */
if ( ext == NULL ) { if ( ext == NULL ) {
ext = sieve_extension_alloc(svinst, extdef); ext = sieve_extension_alloc(svinst, extdef);
sieve_extension_insert(svinst, extdef->name, ext); hash_table_insert
(svinst->ext_reg->extension_index, extdef->name, ext);
} else if ( ext->overridden ) { } else if ( ext->overridden ) {
/* Create a dummy */ /* Create a dummy */
...@@ -513,7 +505,8 @@ void sieve_extension_override ...@@ -513,7 +505,8 @@ void sieve_extension_override
ext->id < (int) array_count(&ext_reg->extensions) ); ext->id < (int) array_count(&ext_reg->extensions) );
mod_ext = array_idx(&ext_reg->extensions, ext->id); mod_ext = array_idx(&ext_reg->extensions, ext->id);
sieve_extension_insert(svinst, name, *mod_ext); hash_table_update
(ext_reg->extension_index, name, *mod_ext);
if ( old_ext != NULL ) if ( old_ext != NULL )
old_ext->overridden = TRUE; old_ext->overridden = TRUE;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Consent

On this website, we use the web analytics service Matomo to analyze and review the use of our website. Through the collected statistics, we can improve our offerings and make them more appealing for you. Here, you can decide whether to allow us to process your data and set corresponding cookies for these purposes, in addition to technically necessary cookies. Further information on data protection—especially regarding "cookies" and "Matomo"—can be found in our privacy policy. You can withdraw your consent at any time.