lib-auth: Move content of auth-client-request.h to auth-client-private.h.

diff --git a/src/lib-auth/Makefile.am b/src/lib-auth/Makefile.am
index 58dbb9e7bf386ca07c336d44223549d3fc2cc3f1..13c42a031405c9e17d118407ecb21dc3ae063023 100644 (file)
--- a/src/lib-auth/Makefile.am
+++ b/src/lib-auth/Makefile.am
@@ -14,7 +14,6 @@ headers = \
        auth-client.h \
        auth-client-interface.h \
        auth-client-private.h \
-       auth-client-request.h \
        auth-master.h
 
 pkginc_libdir=$(pkgincludedir)

diff --git a/src/lib-auth/auth-client-connection.c b/src/lib-auth/auth-client-connection.c
index 71ff7618701f4f8ed8aa3522364424ae04e13917..be72edd836911a74aa1b1d6f3af42b2c355a5ff7 100644 (file)
--- a/src/lib-auth/auth-client-connection.c
+++ b/src/lib-auth/auth-client-connection.c
@@ -11,7 +11,6 @@
 #include "strescape.h"
 #include "eacces-error.h"
 #include "auth-client-private.h"
-#include "auth-client-request.h"
 
 #include <unistd.h>
 

diff --git a/src/lib-auth/auth-client-private.h b/src/lib-auth/auth-client-private.h
index 87e40323bf23b00a6bfe59bd3f3f301f699e4fc0..2ce7f8b6e29596377e74649c5d18b59b07ad419f 100644 (file)
--- a/src/lib-auth/auth-client-private.h
+++ b/src/lib-auth/auth-client-private.h
@@ -48,6 +48,13 @@ struct auth_client {
        bool debug:1;
 };
 
+bool auth_client_request_is_aborted(struct auth_client_request *request);
+time_t auth_client_request_get_create_time(struct auth_client_request *request);
+
+void auth_client_request_server_input(struct auth_client_request *request,
+                                     enum auth_request_status status,
+                                     const char *const *args);
+
 struct auth_server_connection *
 auth_server_connection_init(struct auth_client *client);
 void auth_server_connection_deinit(struct auth_server_connection **conn);

diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c
index 685e799bd92230eb43b3fe45d8b9e0f2c03f60b8..204f442bfca9e2aa767dd7dd00f65cfe2369582c 100644 (file)
--- a/src/lib-auth/auth-client-request.c
+++ b/src/lib-auth/auth-client-request.c
@@ -5,8 +5,6 @@
 #include "strescape.h"
 #include "ostream.h"
 #include "auth-client-private.h"
-#include "auth-client-request.h"
-
 
 struct auth_client_request {
        pool_t pool;

diff --git a/src/lib-auth/auth-client-request.h b/src/lib-auth/auth-client-request.h
deleted file mode 100644 (file)
index 1f0a7be..0000000
--- a/src/lib-auth/auth-client-request.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef AUTH_CLIENT_REQUEST_H
-#define AUTH_CLIENT_REQUEST_H
-
-struct auth_server_connection;
-
-bool auth_client_request_is_aborted(struct auth_client_request *request);
-time_t auth_client_request_get_create_time(struct auth_client_request *request);
-
-void auth_client_request_server_input(struct auth_client_request *request,
-                                     enum auth_request_status status,
-                                     const char *const *args);
-
-#endif