Skip to content

Commit

Permalink
*-login, imapc: Fix new lib-sasl API usage
Browse files Browse the repository at this point in the history
Forgot to include these in a669d35
  • Loading branch information
sirainen authored and GitLab committed Dec 23, 2016
1 parent ce23127 commit 2c5c293
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/imap-login/imap-proxy.c
Expand Up @@ -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.
Expand Down Expand Up @@ -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;

Expand Down
5 changes: 2 additions & 3 deletions src/lib-imap-client/imapc-connection.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions src/pop3-login/pop3-proxy.c
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down

0 comments on commit 2c5c293

Please sign in to comment.