lib-dict: Set connections' event_parent correctly

dict->dict.event is NULL at this point.

diff --git a/src/lib-dict/dict-client.c b/src/lib-dict/dict-client.c
index 0aa61161286c667e3819901c7ac0de0047bb9936..ee16e10ce47a8799fe93f7e54b1abb6e215195d0 100644 (file)
--- a/src/lib-dict/dict-client.c
+++ b/src/lib-dict/dict-client.c
@@ -748,6 +748,7 @@ client_dict_init(struct dict *driver, const char *uri,
        dict = i_new(struct client_dict, 1);
        dict->dict = *driver;
        dict->conn.dict = dict;
+       dict->conn.conn.event_parent = set->event_parent;
        dict->value_type = set->value_type;
        dict->username = i_strdup(set->username);
        dict->idle_msecs = idle_msecs;

diff --git a/src/lib-dict/dict-memcached-ascii.c b/src/lib-dict/dict-memcached-ascii.c
index c9ba7802009df0282b889b81101da7d8af9f47ee..96846cabbea3699f816aa3e703f4d9cc688dded0 100644 (file)
--- a/src/lib-dict/dict-memcached-ascii.c
+++ b/src/lib-dict/dict-memcached-ascii.c
@@ -429,7 +429,7 @@ memcached_ascii_dict_init(struct dict *driver, const char *uri,
                return -1;
        }
 
-       dict->conn.conn.event_parent = dict->dict.event;
+       dict->conn.conn.event_parent = set->event_parent;
        connection_init_client_ip(memcached_ascii_connections, &dict->conn.conn,
                                  NULL, &dict->ip, dict->port);
        event_set_append_log_prefix(dict->conn.conn.event, "memcached: ");

diff --git a/src/lib-dict/dict-memcached.c b/src/lib-dict/dict-memcached.c
index 719d41af339e9b055a1cb8bc3470852d735407c3..3f907cfa723d38248e01138fc087f0b5cf777af5 100644 (file)
--- a/src/lib-dict/dict-memcached.c
+++ b/src/lib-dict/dict-memcached.c
@@ -167,7 +167,7 @@ static const struct connection_vfuncs memcached_conn_vfuncs = {
 
 static int
 memcached_dict_init(struct dict *driver, const char *uri,
-                   const struct dict_settings *set ATTR_UNUSED,
+                   const struct dict_settings *set,
                    struct dict **dict_r, const char **error_r)
 {
        struct memcached_dict *dict;
@@ -222,7 +222,7 @@ memcached_dict_init(struct dict *driver, const char *uri,
                return -1;
        }
 
-       dict->conn.conn.event_parent = dict->dict.event;
+       dict->conn.conn.event_parent = set->event_parent;
 
        connection_init_client_ip(memcached_connections, &dict->conn.conn,
                                  NULL, &dict->ip, dict->port);