Mercurial > dovecot > original-hg > dovecot-1.2

changeset 8373:9524ec6e14fc HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
auth-master API cleanups.
author Timo Sirainen <tss@iki.fi>
date Sat, 01 Nov 2008 15:12:14 +0200
parents 469fc16380da
children 9d7c0ff9c2a0
files src/deliver/auth-client.c src/lib-auth/auth-master.c src/lib-auth/auth-master.h src/plugins/expire/auth-client.c src/plugins/expire/auth-client.h src/plugins/expire/expire-tool.c
diffstat 6 files changed, 31 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/src/deliver/auth-client.c	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/deliver/auth-client.c	Sat Nov 01 15:12:14 2008 +0200
@@ -128,7 +128,7 @@
 				    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;
--- a/src/lib-auth/auth-master.c	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/lib-auth/auth-master.c	Sat Nov 01 15:12:14 2008 +0200
@@ -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 @@
 	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 @@
 	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 @@
 	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 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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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)
 {
--- a/src/lib-auth/auth-master.h	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/lib-auth/auth-master.h	Sat Nov 01 15:12:14 2008 +0200
@@ -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 @@
 	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);
 
--- a/src/plugins/expire/auth-client.c	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/plugins/expire/auth-client.c	Sat Nov 01 15:12:14 2008 +0200
@@ -65,7 +65,7 @@
 	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 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);
--- a/src/plugins/expire/auth-client.h	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/plugins/expire/auth-client.h	Sat Nov 01 15:12:14 2008 +0200
@@ -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
--- a/src/plugins/expire/expire-tool.c	Tue Oct 28 12:42:22 2008 +0100
+++ b/src/plugins/expire/expire-tool.c	Sat Nov 01 15:12:14 2008 +0200
@@ -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;