lib-auth: Replace auth-master-client category with auth-client

The auth-client and auth-master connections are using mostly the same auth
API. Also the auth-master event names were already auth_client_*. So
there's not much point in having separate categories for them - it's just
confusing.

diff --git a/src/lib-auth/auth-client-private.h b/src/lib-auth/auth-client-private.h
index ccbfe4a0e4659902f618dbe15c082a956240fe7d..f7f8048d5a58cd6266be38e573e3cfda249680ea 100644 (file)
--- a/src/lib-auth/auth-client-private.h
+++ b/src/lib-auth/auth-client-private.h
@@ -60,6 +60,8 @@ struct auth_client {
        bool debug:1;
 };
 
+extern struct event_category event_category_auth_client;
+
 bool auth_client_request_is_aborted(struct auth_client_request *request);
 time_t auth_client_request_get_create_time(struct auth_client_request *request);
 

diff --git a/src/lib-auth/auth-client.c b/src/lib-auth/auth-client.c
index 4f49f855013769e31e6d00cba309a26758707d61..9523282cfd094a1046b8a81124224ae298c40b1c 100644 (file)
--- a/src/lib-auth/auth-client.c
+++ b/src/lib-auth/auth-client.c
@@ -4,7 +4,7 @@
 #include "array.h"
 #include "auth-client-private.h"
 
-static struct event_category event_category_auth_client = {
+struct event_category event_category_auth_client = {
        .name = "auth-client"
 };
 

diff --git a/src/lib-auth/auth-master.c b/src/lib-auth/auth-master.c
index 5eb48b3c50ba0ab08ec9c5c5b5bdecc35ccf6aad..d2dabf22b3edb053645628a535fee9ef09a18f72 100644 (file)
--- a/src/lib-auth/auth-master.c
+++ b/src/lib-auth/auth-master.c
@@ -12,6 +12,7 @@
 #include "strescape.h"
 #include "connection.h"
 #include "master-interface.h"
+#include "auth-client-private.h"
 #include "auth-master.h"
 
 #include <unistd.h>
@@ -24,10 +25,6 @@
 #define MAX_INBUF_SIZE 8192
 #define MAX_OUTBUF_SIZE 1024
 
-static struct event_category event_category_auth_master_client = {
-       .name = "auth-master-client"
-};
-
 struct auth_master_connection {
        struct connection conn;
        struct connection_list *clist;
@@ -110,7 +107,7 @@ auth_master_init(const char *auth_socket_path, enum auth_master_flags flags)
                                           &auth_master_vfuncs);
 
        conn->event_parent = conn->event = event_create(NULL);
-       event_add_category(conn->event_parent, &event_category_auth_master_client);
+       event_add_category(conn->event_parent, &event_category_auth_client);
        event_set_append_log_prefix(conn->event_parent, "auth-master: ");
        event_set_forced_debug(conn->event_parent,
                               HAS_ALL_BITS(flags, AUTH_MASTER_FLAG_DEBUG));