Upgraded to Dovecot v2.1 and Pigeonhole v0.3.
authorStephan Bosch <stephan@rename-it.nl>
Sun Dec 16 10:43:05 2012 +0100 (2012-12-16)
changeset 34c926a6dd3736
parent 33 fcd53c829e9d
child 35 9b3dd53f587c
Upgraded to Dovecot v2.1 and Pigeonhole v0.3.
configure.in
src/ext-extdata-common.c
     1.1 --- a/configure.in	Sun Jun 26 23:46:08 2011 +0200
     1.2 +++ b/configure.in	Sun Dec 16 10:43:05 2012 +0100
     1.3 @@ -1,4 +1,4 @@
     1.4 -AC_INIT([Pigeonhole Sieve Extdata plugin], [0.1.0], [dovecot@dovecot.org], [pigeonhole-sieve-extdata])
     1.5 +AC_INIT([Pigeonhole Sieve Extdata plugin], [0.1.0], [dovecot@dovecot.org], [pigeonhole-0.3-sieve-extdata])
     1.6  AC_CONFIG_SRCDIR([src])
     1.7  AC_CONFIG_MACRO_DIR([m4])
     1.8  
     2.1 --- a/src/ext-extdata-common.c	Sun Jun 26 23:46:08 2011 +0200
     2.2 +++ b/src/ext-extdata-common.c	Sun Dec 16 10:43:05 2012 +0100
     2.3 @@ -85,6 +85,7 @@
     2.4  ext_extdata_interpreter_get_context
     2.5  (const struct sieve_extension *ext, const struct sieve_runtime_env *renv)
     2.6  {
     2.7 +	struct sieve_instance *svinst = ext->svinst;
     2.8  	struct ext_extdata_context *ext_data =
     2.9  		(struct ext_extdata_context *) ext->context;
    2.10  	struct ext_extdata_interpreter_context *ictx = 
    2.11 @@ -101,12 +102,12 @@
    2.12  	/* We cannot access the dict if no URI is configured or when the username is
    2.13  	 * not known.
    2.14  	 */
    2.15 -	if ( ext_data == NULL || senv->username == NULL )
    2.16 +	if ( ext_data == NULL || svinst->username == NULL )
    2.17  		return NULL;
    2.18  
    2.19  	/* Initialize the dict */
    2.20  	dict = dict_init
    2.21 -		(ext_data->dict_uri, DICT_DATA_TYPE_STRING, senv->username, PKG_RUNDIR);
    2.22 +		(ext_data->dict_uri, DICT_DATA_TYPE_STRING, svinst->username, PKG_RUNDIR);
    2.23  
    2.24  	if ( dict == NULL ) {
    2.25  		sieve_runtime_critical(renv, NULL,