auth-master API cleanups.

--HG--
branch : HEAD

diff --git a/src/deliver/auth-client.c b/src/deliver/auth-client.c
index 7786014708c030e121cda27c9243afb8bdcc6a97..18ea8e9c69bd4f18daeaace6fc94fb585f850668 100644 (file)
--- a/src/deliver/auth-client.c
+++ b/src/deliver/auth-client.c
@@ -128,7 +128,7 @@ int auth_client_lookup_and_restrict(const char *auth_socket,
                                    const char *user, uid_t euid, pool_t pool,
                                    ARRAY_TYPE(const_string) *extra_fields_r)
 {
-        struct auth_connection *conn;
+        struct auth_master_connection *conn;
        struct auth_user_reply reply;
        bool debug = getenv("DEBUG") != NULL;
        int ret = EX_TEMPFAIL;

diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c
index cf2d447d2c0fde9c9a56cd5c9339ab9c13e50ae5..02e5de3d24e40f7d9b0529bce77a59a2f963b306 100644 (file)
--- a/src/lib-auth/auth-master.c
+++ b/src/lib-auth/auth-master.c
@@ -21,7 +21,7 @@
 #define MAX_INBUF_SIZE 8192
 #define MAX_OUTBUF_SIZE 1024
 
-struct auth_connection {
+struct auth_master_connection {
        char *auth_socket_path;
 
        int fd;
@@ -43,21 +43,21 @@ struct auth_connection {
        unsigned int aborted:1;
 };
 
-static void auth_input(struct auth_connection *conn);
+static void auth_input(struct auth_master_connection *conn);
 
-struct auth_connection *
+struct auth_master_connection *
 auth_master_init(const char *auth_socket_path, bool debug)
 {
-       struct auth_connection *conn;
+       struct auth_master_connection *conn;
 
-       conn = i_new(struct auth_connection, 1);
+       conn = i_new(struct auth_master_connection, 1);
        conn->auth_socket_path = i_strdup(auth_socket_path);
        conn->fd = -1;
        conn->debug = debug;
        return conn;
 }
 
-static void auth_connection_close(struct auth_connection *conn)
+static void auth_connection_close(struct auth_master_connection *conn)
 {
        if (conn->to != NULL)
                timeout_remove(&conn->to);
@@ -71,9 +71,9 @@ static void auth_connection_close(struct auth_connection *conn)
        conn->handshaked = FALSE;
 }
 
-void auth_master_deinit(struct auth_connection **_conn)
+void auth_master_deinit(struct auth_master_connection **_conn)
 {
-       struct auth_connection *conn = *_conn;
+       struct auth_master_connection *conn = *_conn;
 
        *_conn = NULL;
        auth_connection_close(conn);
@@ -81,13 +81,13 @@ void auth_master_deinit(struct auth_connection **_conn)
        i_free(conn);
 }
 
-static void auth_request_lookup_abort(struct auth_connection *conn)
+static void auth_request_lookup_abort(struct auth_master_connection *conn)
 {
        io_loop_stop(conn->ioloop);
        conn->aborted = TRUE;
 }
 
-static void auth_parse_input(struct auth_connection *conn,
+static void auth_parse_input(struct auth_master_connection *conn,
                             const char *const *args)
 {
        struct auth_user_reply *reply = conn->user_reply;
@@ -116,7 +116,7 @@ static void auth_parse_input(struct auth_connection *conn,
        }
 }
 
-static int auth_input_handshake(struct auth_connection *conn)
+static int auth_input_handshake(struct auth_master_connection *conn)
 {
        const char *line, *const *tmp;
 
@@ -140,7 +140,7 @@ static int auth_input_handshake(struct auth_connection *conn)
        return 0;
 }
 
-static void auth_input(struct auth_connection *conn)
+static void auth_input(struct auth_master_connection *conn)
 {
        const char *line, *cmd, *const *args, *id, *wanted_id;
 
@@ -210,7 +210,7 @@ static void auth_input(struct auth_connection *conn)
        auth_request_lookup_abort(conn);
 }
 
-static int auth_master_connect(struct auth_connection *conn)
+static int auth_master_connect(struct auth_master_connection *conn)
 {
        int fd, try;
 
@@ -234,7 +234,7 @@ static int auth_master_connect(struct auth_connection *conn)
        return 0;
 }
 
-static void auth_request_timeout(struct auth_connection *conn)
+static void auth_request_timeout(struct auth_master_connection *conn)
 {
        if (!conn->handshaked)
                i_error("userdb lookup(%s): Connecting timed out", conn->user);
@@ -243,12 +243,12 @@ static void auth_request_timeout(struct auth_connection *conn)
        auth_request_lookup_abort(conn);
 }
 
-static void auth_idle_timeout(struct auth_connection *conn)
+static void auth_idle_timeout(struct auth_master_connection *conn)
 {
        auth_connection_close(conn);
 }
 
-static void auth_master_set_io(struct auth_connection *conn)
+static void auth_master_set_io(struct auth_master_connection *conn)
 {
        if (conn->to != NULL)
                timeout_remove(&conn->to);
@@ -262,7 +262,7 @@ static void auth_master_set_io(struct auth_connection *conn)
        lib_signals_reset_ioloop();
 }
 
-static void auth_master_unset_io(struct auth_connection *conn,
+static void auth_master_unset_io(struct auth_master_connection *conn,
                                 struct ioloop *prev_ioloop)
 {
        io_loop_set_current(prev_ioloop);
@@ -292,7 +292,7 @@ static bool is_valid_string(const char *str)
        return TRUE;
 }
 
-int auth_master_user_lookup(struct auth_connection *conn,
+int auth_master_user_lookup(struct auth_master_connection *conn,
                            const char *user, const char *service,
                            pool_t pool, struct auth_user_reply *reply_r)
 {

diff --git a/src/lib-auth/auth-master.h b/src/lib-auth/auth-master.h
index d2d2d4fc5d04bb871013a90b13a6bfe0a3e792b3..7f1cce774539747878b6219a2102acf8caa559f2 100644 (file)
--- a/src/lib-auth/auth-master.h
+++ b/src/lib-auth/auth-master.h
@@ -1,6 +1,8 @@
 #ifndef AUTH_MASTER_H
 #define AUTH_MASTER_H
 
+#define AUTH_SERVICE_INTERNAL "internal"
+
 struct auth_user_reply {
        uid_t uid;
        gid_t gid;
@@ -8,12 +10,12 @@ struct auth_user_reply {
        ARRAY_TYPE(const_string) extra_fields;
 };
 
-struct auth_connection *
+struct auth_master_connection *
 auth_master_init(const char *auth_socket_path, bool debug);
-void auth_master_deinit(struct auth_connection **conn);
+void auth_master_deinit(struct auth_master_connection **conn);
 
 /* Returns -1 = error, 0 = user not found, 1 = ok */
-int auth_master_user_lookup(struct auth_connection *conn,
+int auth_master_user_lookup(struct auth_master_connection *conn,
                            const char *user, const char *service,
                            pool_t pool, struct auth_user_reply *reply_r);
 

diff --git a/src/plugins/expire/auth-client.c b/src/plugins/expire/auth-client.c
index 2d55ae6c6073986b3aae5f974b0a8b72633227c5..8d8d856cbe5d0d11edfae565cf10f517a39f3cc1 100644 (file)
--- a/src/plugins/expire/auth-client.c
+++ b/src/plugins/expire/auth-client.c
@@ -65,7 +65,7 @@ static void auth_set_env(const char *user, struct auth_user_reply *reply)
        env_put(t_strconcat("HOME=", reply->home, NULL));
 }
 
-int auth_client_put_user_env(struct auth_connection *conn,
+int auth_client_put_user_env(struct auth_master_connection *conn,
                             const char *user)
 {
        struct auth_user_reply reply;
@@ -73,7 +73,8 @@ int auth_client_put_user_env(struct auth_connection *conn,
        int ret;
 
        pool = pool_alloconly_create("userdb lookup", 512);
-       ret = auth_master_user_lookup(conn, user, "expire", pool, &reply);
+       ret = auth_master_user_lookup(conn, user, AUTH_SERVICE_INTERNAL,
+                                     pool, &reply);
        if (ret > 0)
                auth_set_env(user, &reply);
        pool_unref(&pool);

diff --git a/src/plugins/expire/auth-client.h b/src/plugins/expire/auth-client.h
index a78efc293e08d925df7a219c6b4dd71f63ea6000..73263b43fe6478a02066338cd223a940b3b23bef 100644 (file)
--- a/src/plugins/expire/auth-client.h
+++ b/src/plugins/expire/auth-client.h
@@ -1,11 +1,10 @@
 #ifndef AUTH_CLIENT_H
 #define AUTH_CLIENT_H
 
-struct auth_connection *auth_connection_init(const char *auth_socket);
-void auth_connection_deinit(struct auth_connection *conn);
+struct auth_master_connection;
 
 /* Returns -1 = error, 0 = user not found, 1 = ok */
-int auth_client_put_user_env(struct auth_connection *conn,
+int auth_client_put_user_env(struct auth_master_connection *conn,
                             const char *user);
 
 #endif

diff --git a/src/plugins/expire/expire-tool.c b/src/plugins/expire/expire-tool.c
index 35c9a5153766366c2097c5492ba5254c0480433d..d8bf039e5c3cc6c190bbf2bde8754af9cc38b644 100644 (file)
--- a/src/plugins/expire/expire-tool.c
+++ b/src/plugins/expire/expire-tool.c
@@ -12,6 +12,7 @@
 #include "mail-storage.h"
 #include "mail-namespace.h"
 #include "auth-client.h"
+#include "auth-master.h"
 #include "expire-env.h"
 
 #include <stdlib.h>
@@ -23,7 +24,7 @@
 #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
 
 struct expire_context {
-       struct auth_connection *auth_conn;
+       struct auth_master_connection *auth_conn;
 
        char *user;
        struct mail_user *mail_user;