database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-26 23:43:30 +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

9
src/backend/libpq/auth-scram.c
View File

@@ -791,6 +791,7 @@ read_client_first_message(scram_state *state, char *input)
switch (*input)
{
case 'n':
/*
* The client does not support channel binding or has simply
* decided to not use it. In that case just let it go.
@@ -805,6 +806,7 @@ read_client_first_message(scram_state *state, char *input)
input++;
break;
case 'y':
/*
* The client supports channel binding and thinks that the server
* does not. In this case, the server must fail authentication if
@@ -827,12 +829,13 @@ read_client_first_message(scram_state *state, char *input)
input++;
break;
case 'p':
/*
* The client requires channel binding. Channel binding type
* follows, e.g., "p=tls-unique".
*/
{
char *channel_binding_type;
char *channel_binding_type;
if (!state->ssl_in_use)
{
@@ -1139,8 +1142,8 @@ read_client_final_message(scram_state *state, char *input)
b64_message[b64_message_len] = '\0';
/*
* Compare the value sent by the client with the value expected by
* the server.
* Compare the value sent by the client with the value expected by the
* server.
*/
if (strcmp(channel_binding, b64_message) != 0)
ereport(ERROR,

8
src/backend/libpq/auth.c
View File

@@ -100,7 +100,8 @@ static struct pam_conv pam_passw_conv = {
NULL
};
static const char *pam_passwd = NULL; /* Workaround for Solaris 2.6 brokenness */
static const char *pam_passwd = NULL; /* Workaround for Solaris 2.6
* brokenness */
static Port *pam_port_cludge; /* Workaround for passing "Port *port" into
* pam_passwd_conv_proc */
#endif /* USE_PAM */
@@ -914,6 +915,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
pfree(sasl_mechs);
#ifdef USE_SSL
/*
* Get data for channel binding.
*/
@@ -2343,7 +2345,7 @@ CheckBSDAuth(Port *port, char *user)
*/
#ifdef USE_LDAP
static int errdetail_for_ldap(LDAP *ldap);
static int errdetail_for_ldap(LDAP *ldap);
/*
* Initialize a connection to the LDAP server, including setting up
@@ -2514,7 +2516,7 @@ CheckLDAPAuth(Port *port)
char *filter;
LDAPMessage *search_message;
LDAPMessage *entry;
char *attributes[] = { LDAP_NO_ATTRS, NULL };
char *attributes[] = {LDAP_NO_ATTRS, NULL};
char *dn;
char *c;
int count;