lib-auth-client: auth-master - Define sub-class structure for userdb lookup

diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c
index a2ace1e4cdf1b560e9756e82b4030bd9a13399d6..e1cfd8dc54db4c3a57c0ec4bf834c0a7aa6feb94 100644 (file)
--- a/src/lib-auth-client/auth-master.c
+++ b/src/lib-auth-client/auth-master.c
@@ -1058,6 +1058,10 @@ auth_master_pass_lookup_start(struct auth_master_pass_lookup *lookup,
 
 /* USER */
 
+struct auth_master_user_lookup {
+       struct auth_master_lookup lookup;
+};
+
 struct auth_master_user_lookup_ctx {
        pool_t pool;
 
@@ -1071,7 +1075,7 @@ auth_master_user_lookup_finished(struct auth_master_lookup *_lookup,
                                 int result, const char *const *fields,
                                 struct auth_master_user_lookup_ctx *ctx);
 struct auth_master_request *
-auth_master_user_lookup_start(struct auth_master_lookup *lookup,
+auth_master_user_lookup_start(struct auth_master_user_lookup *lookup,
                              struct auth_master_connection *conn,
                              const char *user,
                              const struct auth_user_info *info);
@@ -1091,7 +1095,7 @@ int auth_master_user_lookup(struct auth_master_connection *conn,
                            pool_t pool, const char **username_r,
                            const char *const **fields_r)
 {
-       struct auth_master_lookup lookup;
+       struct auth_master_user_lookup lookup;
        struct auth_master_request *req;
 
        if (!is_valid_string(user) || !is_valid_string(info->protocol)) {
@@ -1111,14 +1115,15 @@ int auth_master_user_lookup(struct auth_master_connection *conn,
        };
 
        i_zero(&lookup);
-       lookup.pool = pool;
+       lookup.lookup.pool = pool;
 
        req = auth_master_user_lookup_start(&lookup, conn, user, info);
        (void)auth_master_request_wait(req);
 
-       auth_master_user_lookup_finished(&lookup, lookup.return_value,
-                                        lookup.fields, &ctx);
-       event_unref(&lookup.event);
+       auth_master_user_lookup_finished(&lookup.lookup,
+                                        lookup.lookup.return_value,
+                                        lookup.lookup.fields, &ctx);
+       event_unref(&lookup.lookup.event);
 
        *username_r = ctx.username;
        *fields_r = ctx.fields != NULL ? ctx.fields :
@@ -1166,7 +1171,7 @@ auth_master_user_lookup_finished(struct auth_master_lookup *_lookup,
 }
 
 struct auth_master_request *
-auth_master_user_lookup_start(struct auth_master_lookup *lookup,
+auth_master_user_lookup_start(struct auth_master_user_lookup *lookup,
                              struct auth_master_connection *conn,
                              const char *user,
                              const struct auth_user_info *info)
@@ -1174,28 +1179,28 @@ auth_master_user_lookup_start(struct auth_master_lookup *lookup,
        struct auth_master_request *req;
        string_t *args;
 
-       lookup->conn = conn;
-       lookup->return_value = -1;
-       lookup->expected_reply = "USER";
-       lookup->user = user;
+       lookup->lookup.conn = conn;
+       lookup->lookup.return_value = -1;
+       lookup->lookup.expected_reply = "USER";
+       lookup->lookup.user = user;
 
        args = t_str_new(128);
        str_append(args, user);
        auth_user_info_export(args, info);
 
-       lookup->event = auth_master_user_event_create(
+       lookup->lookup.event = auth_master_user_event_create(
                conn, t_strdup_printf("userdb lookup(%s): ", user), info);
-       event_add_str(lookup->event, "user", user);
+       event_add_str(lookup->lookup.event, "user", user);
 
        struct event_passthrough *e =
-               event_create_passthrough(lookup->event)->
+               event_create_passthrough(lookup->lookup.event)->
                set_name("auth_client_userdb_lookup_started");
        e_debug(e->event(), "Started userdb lookup");
 
        req = auth_master_request(conn, "USER", str_data(args), str_len(args),
-                                 auth_lookup_reply_callback, lookup);
+                                 auth_lookup_reply_callback, &lookup->lookup);
 
-       auth_master_request_set_event(req, lookup->event);
+       auth_master_request_set_event(req, lookup->lookup.event);
 
        return req;
 }