lib-auth-client: auth-master - Move definitions to new auth-master-private.h

diff --git a/src/lib-auth-client/Makefile.am b/src/lib-auth-client/Makefile.am
index 04e35c3b44718a0061cedf77bfa829174f77055f..035f8b6fcb453942517cbe8a34a21e98389ef164 100644 (file)
--- a/src/lib-auth-client/Makefile.am
+++ b/src/lib-auth-client/Makefile.am
@@ -19,6 +19,7 @@ headers = \
        auth-client-interface.h \
        auth-client-private.h \
        auth-master.h \
+       auth-master-private.h \
        auth-proxy.h
 
 pkginc_libdir=$(pkgincludedir)

diff --git a/src/lib-auth-client/auth-master-private.h b/src/lib-auth-client/auth-master-private.h
new file mode 100644 (file)
index 0000000..cf5ab58
--- /dev/null
+++ b/src/lib-auth-client/auth-master-private.h
@@ -0,0 +1,39 @@
+#ifndef AUTH_MASTER_PRIVATE_H
+#define AUTH_MASTER_PRIVATE_H
+
+#include "connection.h"
+#include "auth-client-interface.h"
+#include "auth-client-private.h"
+#include "auth-master.h"
+#include "master-interface.h"
+
+#define AUTH_MASTER_IDLE_SECS 60
+
+#define MAX_INBUF_SIZE 8192
+#define MAX_OUTBUF_SIZE 1024
+
+struct auth_master_connection {
+       struct connection conn;
+       struct connection_list *clist;
+       struct event *event_parent, *event;
+
+       char *auth_socket_path;
+       enum auth_master_flags flags;
+
+       struct ioloop *ioloop, *prev_ioloop;
+       struct timeout *to;
+
+       unsigned int request_counter;
+
+       bool (*reply_callback)(const char *cmd, const char *const *args,
+                              void *context);
+       void *reply_context;
+
+       unsigned int timeout_msecs;
+
+       bool connected:1;
+       bool sent_handshake:1;
+       bool aborted:1;
+};
+
+#endif

diff --git a/src/lib-auth-client/auth-master.c b/src/lib-auth-client/auth-master.c
index a70e84bea750c12fa9f6dca518ce65df06bfa253..7864cda43e08ef79279117543d6feaf60a017c62 100644 (file)
--- a/src/lib-auth-client/auth-master.c
+++ b/src/lib-auth-client/auth-master.c
@@ -10,43 +10,9 @@
 #include "ostream.h"
 #include "str.h"
 #include "strescape.h"
-#include "connection.h"
-#include "auth-client-interface.h"
-#include "master-interface.h"
 #include "master-service.h"
-#include "auth-client-private.h"
-#include "auth-master.h"
 
-#include <unistd.h>
-
-#define AUTH_MASTER_IDLE_SECS 60
-
-#define MAX_INBUF_SIZE 8192
-#define MAX_OUTBUF_SIZE 1024
-
-struct auth_master_connection {
-       struct connection conn;
-       struct connection_list *clist;
-       struct event *event_parent, *event;
-
-       char *auth_socket_path;
-       enum auth_master_flags flags;
-
-       struct ioloop *ioloop, *prev_ioloop;
-       struct timeout *to;
-
-       unsigned int request_counter;
-
-       bool (*reply_callback)(const char *cmd, const char *const *args,
-                              void *context);
-       void *reply_context;
-
-       unsigned int timeout_msecs;
-
-       bool connected:1;
-       bool sent_handshake:1;
-       bool aborted:1;
-};
+#include "auth-master-private.h"
 
 static void auth_master_connected(struct connection *_conn, bool success);
 static int