auth: Include auth-client-interface.h from auth-client-connection.h

It makes more sense there anyway.

diff --git a/src/auth/auth-client-connection.h b/src/auth/auth-client-connection.h
index 136c39f09d45fbb10b3b11eba0bf074909f9cd6c..194350cdf0f8b9a47aeb21f6ca1c7846c360d48c 100644 (file)
--- a/src/auth/auth-client-connection.h
+++ b/src/auth/auth-client-connection.h
@@ -2,6 +2,7 @@
 #define AUTH_CLIENT_CONNECTION_H
 
 #include "login-interface.h"
+#include "auth-client-interface.h"
 
 #define AUTH_CLIENT_MINOR_VERSION_CHANNEL_BINDING 3
 

diff --git a/src/auth/sasl-server-mech-winbind.c b/src/auth/sasl-server-mech-winbind.c
index 11da7abcc6565accfe888021a6185ce653d27b44..edf1f75670937d55bc31faba0f9bf69ce7f760ab 100644 (file)
--- a/src/auth/sasl-server-mech-winbind.c
+++ b/src/auth/sasl-server-mech-winbind.c
@@ -21,6 +21,8 @@
 #include <unistd.h>
 #include <sys/wait.h>
 
+#define MAX_LINE_LENGTH 16384
+
 enum helper_result {
        HR_OK   = 0,    /* OK or continue */
        HR_FAIL = -1,   /* authentication failed */
@@ -143,7 +145,7 @@ winbind_helper_connect(const struct auth_settings *set,
 
        winbind->pid = pid;
        winbind->in_pipe =
-               i_stream_create_fd_autoclose(&infd[0], AUTH_CLIENT_MAX_LINE_LENGTH);
+               i_stream_create_fd_autoclose(&infd[0], MAX_LINE_LENGTH);
        winbind->out_pipe =
                o_stream_create_fd_autoclose(&outfd[1], SIZE_MAX);
 

diff --git a/src/auth/sasl-server.h b/src/auth/sasl-server.h
index 839d707791bd9b0ec6da866179be667d282fbd85..6f4b4cab451e236339b3269961df67a107c72f71 100644 (file)
--- a/src/auth/sasl-server.h
+++ b/src/auth/sasl-server.h
@@ -1,8 +1,6 @@
 #ifndef SASL_SERVER_H
 #define SASL_SERVER_H
 
-#include "auth-client-interface.h"
-
 #include "sasl-common.h"
 
 enum sasl_passdb_result_status {