dovecot-1.2: auth-master API cleanups.
dovecot at dovecot.org
dovecot at dovecot.org
Sat Nov 1 15:12:20 EET 2008
details: http://hg.dovecot.org/dovecot-1.2/rev/9524ec6e14fc
changeset: 8373:9524ec6e14fc
user: Timo Sirainen <tss at iki.fi>
date: Sat Nov 01 15:12:14 2008 +0200
description:
auth-master API cleanups.
diffstat:
6 files changed, 34 insertions(+), 31 deletions(-)
src/deliver/auth-client.c | 2 -
src/lib-auth/auth-master.c | 42 +++++++++++++++++++-------------------
src/lib-auth/auth-master.h | 8 ++++---
src/plugins/expire/auth-client.c | 5 ++--
src/plugins/expire/auth-client.h | 5 +---
src/plugins/expire/expire-tool.c | 3 +-
diffs (237 lines):
diff -r 469fc16380da -r 9524ec6e14fc src/deliver/auth-client.c
--- 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 @@ int auth_client_lookup_and_restrict(cons
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 -r 469fc16380da -r 9524ec6e14fc src/lib-auth/auth-master.c
--- 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 @@ struct auth_connection {
unsigned int aborted:1;
};
-static void auth_input(struct auth_connection *conn);
-
-struct auth_connection *
+static void auth_input(struct auth_master_connection *conn);
+
+struct auth_master_connection *
auth_master_init(const char *auth_socket_path, bool debug)
{
- struct auth_connection *conn;
-
- conn = i_new(struct auth_connection, 1);
+ struct auth_master_connection *conn;
+
+ 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
conn->handshaked = FALSE;
}
-void auth_master_deinit(struct auth_connection **_conn)
-{
- struct auth_connection *conn = *_conn;
+void auth_master_deinit(struct auth_master_connection **_conn)
+{
+ struct auth_master_connection *conn = *_conn;
*_conn = NULL;
auth_connection_close(conn);
@@ -81,13 +81,13 @@ void auth_master_deinit(struct auth_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
}
}
-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 a
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_conne
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 au
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_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 au
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 *
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 -r 469fc16380da -r 9524ec6e14fc src/lib-auth/auth-master.h
--- 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,5 +1,7 @@
#ifndef AUTH_MASTER_H
#define AUTH_MASTER_H
+
+#define AUTH_SERVICE_INTERNAL "internal"
struct auth_user_reply {
uid_t uid;
@@ -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 -r 469fc16380da -r 9524ec6e14fc src/plugins/expire/auth-client.c
--- 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 @@ static void auth_set_env(const char *use
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
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 -r 469fc16380da -r 9524ec6e14fc src/plugins/expire/auth-client.h
--- 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
diff -r 469fc16380da -r 9524ec6e14fc src/plugins/expire/expire-tool.c
--- 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;
More information about the dovecot-cvs
mailing list