mech-oauthbearer.c (dovecot-2.3.16) | : | mech-oauthbearer.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 60 | skipping to change at line 60 | |||
status = t_strdup(value); | status = t_strdup(value); | |||
break; | break; | |||
} else if (jtype == JSON_TYPE_OBJECT_KEY && | } else if (jtype == JSON_TYPE_OBJECT_KEY && | |||
strcmp(value, "status") == 0) { | strcmp(value, "status") == 0) { | |||
found_status = TRUE; | found_status = TRUE; | |||
} else json_parse_skip_next(parser); | } else json_parse_skip_next(parser); | |||
} | } | |||
/* deinitialize json parser */ | /* deinitialize json parser */ | |||
int ret = json_parser_deinit(&parser, &error); | int ret = json_parser_deinit(&parser, &error); | |||
i_stream_unref(&is); | ||||
if (status != NULL) | if (status != NULL) | |||
client->status = p_strdup(_client->pool, status); | client->status = p_strdup(_client->pool, status); | |||
else { | else { | |||
ret = -1; | ret = -1; | |||
if (error == NULL) | if (error == NULL) | |||
error = "Status value missing"; | error = "Status value missing"; | |||
} | } | |||
if (ret < 0) | if (ret < 0) | |||
*error_r = t_strdup_printf("Error parsing JSON reply: %s" , | *error_r = t_strdup_printf("Error parsing JSON reply: %s" , | |||
skipping to change at line 158 | skipping to change at line 159 | |||
(struct oauthbearer_dsasl_client *)_client; | (struct oauthbearer_dsasl_client *)_client; | |||
if (strcmp(key, "host") == 0) { | if (strcmp(key, "host") == 0) { | |||
if (value != NULL) | if (value != NULL) | |||
client->host = p_strdup(_client->pool, value); | client->host = p_strdup(_client->pool, value); | |||
else | else | |||
client->host = NULL; | client->host = NULL; | |||
return 1; | return 1; | |||
} else if (strcmp(key, "port") == 0) { | } else if (strcmp(key, "port") == 0) { | |||
if (value == NULL) { | if (value == NULL) { | |||
client->port = 0; | client->port = 0; | |||
} else if (net_str2port(key, &client->port) < 0) { | } else if (net_str2port(value, &client->port) < 0) { | |||
*error_r = "Invalid port value"; | *error_r = "Invalid port value"; | |||
return -1; | return -1; | |||
} | } | |||
return 1; | return 1; | |||
} | } | |||
return 0; | return 0; | |||
} | } | |||
static int | static int | |||
mech_oauthbearer_get_result(struct dsasl_client *_client, const char *key, | mech_oauthbearer_get_result(struct dsasl_client *_client, const char *key, | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |