*-login, imapc: Fix new lib-sasl API usage

Forgot to include these in a669d351502e15802b121e1a0bd83f27d1d95f01

diff --git a/src/imap-login/imap-proxy.c b/src/imap-login/imap-proxy.c
index 1cdce494ff93dcb882b9f7969898364373830fda..fd6a55227e80d80c9ec1eb39c05fe588f3b6948f 100644 (file)
--- a/src/imap-login/imap-proxy.c
+++ b/src/imap-login/imap-proxy.c
@@ -75,7 +75,7 @@ static int proxy_write_login(struct imap_client *client, string_t *str)
 {
        struct dsasl_client_settings sasl_set;
        const unsigned char *output;
-       unsigned int len;
+       size_t len;
        const char *mech_name, *error;
 
        /* Send CAPABILITY command if we don't know the capabilities yet.
@@ -231,7 +231,7 @@ int imap_proxy_parse_line(struct client *client, const char *line)
        struct ostream *output;
        string_t *str;
        const unsigned char *data;
-       unsigned int data_len;
+       size_t data_len;
        const char *error;
        int ret;
 

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index d6efad017bb3bd75a137a15e0cc48928dc7fae3c..f308c1ceca63413738ef0a7a6d8c7c48901d368f 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -816,8 +816,7 @@ imapc_connection_authenticate_cb(const struct imapc_command_reply *reply,
 {
        struct imapc_connection *conn = context;
        const unsigned char *sasl_output;
-       unsigned int sasl_output_len;
-       size_t input_len;
+       size_t input_len, sasl_output_len;
        buffer_t *buf;
        const char *error;
 
@@ -959,7 +958,7 @@ static void imapc_connection_authenticate(struct imapc_connection *conn)
 
        if ((conn->capabilities & IMAPC_CAPABILITY_SASL_IR) != 0) {
                const unsigned char *sasl_output;
-               unsigned int sasl_output_len;
+               size_t sasl_output_len;
                string_t *sasl_output_base64;
                const char *error;
 

diff --git a/src/pop3-login/pop3-proxy.c b/src/pop3-login/pop3-proxy.c
index e1cceb087ca5bdce9a8c312430bba7374f913e20..5d3df82ceddbd57a807397d300852ad45dd22cee 100644 (file)
--- a/src/pop3-login/pop3-proxy.c
+++ b/src/pop3-login/pop3-proxy.c
@@ -25,7 +25,7 @@ static int proxy_send_login(struct pop3_client *client, struct ostream *output)
 {
        struct dsasl_client_settings sasl_set;
        const unsigned char *sasl_output;
-       unsigned int len;
+       size_t len;
        const char *mech_name, *error;
        string_t *str;
 
@@ -91,7 +91,7 @@ pop3_proxy_continue_sasl_auth(struct client *client, struct ostream *output,
 {
        string_t *str;
        const unsigned char *data;
-       unsigned int data_len;
+       size_t data_len;
        const char *error;
        int ret;