database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-07 00:36:50 +03:00
Code Activity

Update typedefs.list and re-run pgindent

Browse Source 
Discussion: http://postgr.es/m/CA+TgmoaA9=1RWKtBWpDaj+sF3Stgc8sHgf5z=KGtbjwPLQVDMA@mail.gmail.com
This commit is contained in:
Robert Haas
2017-11-29 09:24:24 -05:00
parent 801386af62
commit eaedf0df71
52 changed files with 224 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/interfaces/ecpg/ecpglib/data.c
View File

@ -55,7 +55,8 @@ garbage_left(enum ARRAY_TYPE isarray, char **scan_length, enum COMPAT_MODE compa
if (INFORMIX_MODE(compat) && **scan_length == '.')
{
/* skip invalid characters */
do {
do
{
(*scan_length)++;
} while (isdigit((unsigned char) **scan_length));
}

2
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -1109,7 +1109,7 @@ ecpg_build_params(struct statement *stmt)
struct variable *var;
int desc_counter = 0;
int position = 0;
const char *value;
const char *value;
bool std_strings = false;
/* Get standard_conforming_strings setting. */

4
src/interfaces/libpq/fe-auth-scram.c
View File

@ -491,9 +491,9 @@ build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
free(cbind_input);
}
else if (state->ssl_in_use)
appendPQExpBuffer(&buf, "c=eSws"); /* base64 of "y,," */
appendPQExpBuffer(&buf, "c=eSws"); /* base64 of "y,," */
else
appendPQExpBuffer(&buf, "c=biws"); /* base64 of "n,," */
appendPQExpBuffer(&buf, "c=biws"); /* base64 of "n,," */
if (PQExpBufferDataBroken(buf))
goto oom_error;

7
src/interfaces/libpq/fe-auth.c
View File

@ -534,7 +534,7 @@ pg_SASL_init(PGconn *conn, int payloadlen)
*/
if (conn->ssl_in_use &&
strcmp(mechanism_buf.data, SCRAM_SHA256_PLUS_NAME) == 0)
selected_mechanism = SCRAM_SHA256_PLUS_NAME;
selected_mechanism = SCRAM_SHA256_PLUS_NAME;
else if (strcmp(mechanism_buf.data, SCRAM_SHA256_NAME) == 0 &&
!selected_mechanism)
selected_mechanism = SCRAM_SHA256_NAME;
@ -569,6 +569,7 @@ pg_SASL_init(PGconn *conn, int payloadlen)
}
#ifdef USE_SSL
/*
* Get data for channel binding.
*/
@ -581,8 +582,8 @@ pg_SASL_init(PGconn *conn, int payloadlen)
#endif
/*
* Initialize the SASL state information with all the information
* gathered during the initial exchange.
* Initialize the SASL state information with all the information gathered
* during the initial exchange.
*
* Note: Only tls-unique is supported for the moment.
*/

10
src/interfaces/libpq/fe-auth.h
View File

@ -24,11 +24,11 @@ extern char *pg_fe_getauthname(PQExpBuffer errorMessage);
/* Prototypes for functions in fe-auth-scram.c */
extern void *pg_fe_scram_init(const char *username,
const char *password,
bool ssl_in_use,
const char *sasl_mechanism,
char *tls_finished_message,
size_t tls_finished_len);
const char *password,
bool ssl_in_use,
const char *sasl_mechanism,
char *tls_finished_message,
size_t tls_finished_len);
extern void pg_fe_scram_free(void *opaq);
extern void pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
char **output, int *outputlen,