From 2b86907b218798545e17e5f6cbc985f8368387b5 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Thu, 31 Jan 2019 14:20:33 +0900 Subject: [PATCH 1/6] Simplify SendAuthRequest --- src/backend/libpq/auth.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c index 20fe98fb82..f92f78e17a 100644 --- a/src/backend/libpq/auth.c +++ b/src/backend/libpq/auth.c @@ -43,8 +43,8 @@ * Global authentication functions *---------------------------------------------------------------- */ -static void sendAuthRequest(Port *port, AuthRequest areq, const char *extradata, - int extralen); +static void sendAuthRequest(AuthRequest areq, const char *extradata, + int extralen); static void auth_failed(Port *port, int status, char *logdetail); static char *recv_password_packet(Port *port); @@ -523,7 +523,7 @@ ClientAuthentication(Port *port) case uaGSS: #ifdef ENABLE_GSS - sendAuthRequest(port, AUTH_REQ_GSS, NULL, 0); + sendAuthRequest(AUTH_REQ_GSS, NULL, 0); status = pg_GSS_recvauth(port); #else Assert(false); @@ -532,7 +532,7 @@ ClientAuthentication(Port *port) case uaSSPI: #ifdef ENABLE_SSPI - sendAuthRequest(port, AUTH_REQ_SSPI, NULL, 0); + sendAuthRequest(AUTH_REQ_SSPI, NULL, 0); status = pg_SSPI_recvauth(port); #else Assert(false); @@ -603,7 +603,7 @@ ClientAuthentication(Port *port) (*ClientAuthentication_hook) (port, status); if (status == STATUS_OK) - sendAuthRequest(port, AUTH_REQ_OK, NULL, 0); + sendAuthRequest(AUTH_REQ_OK, NULL, 0); else auth_failed(port, status, logdetail); } @@ -613,7 +613,7 @@ ClientAuthentication(Port *port) * Send an authentication request packet to the frontend. */ static void -sendAuthRequest(Port *port, AuthRequest areq, const char *extradata, int extralen) +sendAuthRequest(AuthRequest areq, const char *extradata, int extralen) { StringInfoData buf; @@ -740,7 +740,7 @@ CheckPasswordAuth(Port *port, char **logdetail) int result; char *shadow_pass; - sendAuthRequest(port, AUTH_REQ_PASSWORD, NULL, 0); + sendAuthRequest(AUTH_REQ_PASSWORD, NULL, 0); passwd = recv_password_packet(port); if (passwd == NULL) @@ -841,7 +841,7 @@ CheckMD5Auth(Port *port, char *shadow_pass, char **logdetail) return STATUS_ERROR; } - sendAuthRequest(port, AUTH_REQ_MD5, md5Salt, 4); + sendAuthRequest(AUTH_REQ_MD5, md5Salt, 4); passwd = recv_password_packet(port); if (passwd == NULL) @@ -895,7 +895,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail) /* Put another '\0' to mark that list is finished. */ appendStringInfoChar(&sasl_mechs, '\0'); - sendAuthRequest(port, AUTH_REQ_SASL, sasl_mechs.data, sasl_mechs.len); + sendAuthRequest(AUTH_REQ_SASL, sasl_mechs.data, sasl_mechs.len); pfree(sasl_mechs.data); /* @@ -1000,9 +1000,9 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail) elog(DEBUG4, "sending SASL challenge of length %u", outputlen); if (result == SASL_EXCHANGE_SUCCESS) - sendAuthRequest(port, AUTH_REQ_SASL_FIN, output, outputlen); + sendAuthRequest(AUTH_REQ_SASL_FIN, output, outputlen); else - sendAuthRequest(port, AUTH_REQ_SASL_CONT, output, outputlen); + sendAuthRequest(AUTH_REQ_SASL_CONT, output, outputlen); pfree(output); } @@ -1220,7 +1220,7 @@ pg_GSS_recvauth(Port *port) elog(DEBUG4, "sending GSS response token of length %u", (unsigned int) port->gss->outbuf.length); - sendAuthRequest(port, AUTH_REQ_GSS_CONT, + sendAuthRequest(AUTH_REQ_GSS_CONT, port->gss->outbuf.value, port->gss->outbuf.length); gss_release_buffer(&lmin_s, &port->gss->outbuf); @@ -1472,7 +1472,7 @@ pg_SSPI_recvauth(Port *port) port->gss->outbuf.length = outbuf.pBuffers[0].cbBuffer; port->gss->outbuf.value = outbuf.pBuffers[0].pvBuffer; - sendAuthRequest(port, AUTH_REQ_GSS_CONT, + sendAuthRequest(AUTH_REQ_GSS_CONT, port->gss->outbuf.value, port->gss->outbuf.length); FreeContextBuffer(outbuf.pBuffers[0].pvBuffer); @@ -2103,7 +2103,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message **msg, * let's go ask the client to send a password, which we * then stuff into PAM. */ - sendAuthRequest(pam_port_cludge, AUTH_REQ_PASSWORD, NULL, 0); + sendAuthRequest(AUTH_REQ_PASSWORD, NULL, 0); passwd = recv_password_packet(pam_port_cludge); if (passwd == NULL) { @@ -2300,7 +2300,7 @@ CheckBSDAuth(Port *port, char *user) int retval; /* Send regular password request to client, and get the response */ - sendAuthRequest(port, AUTH_REQ_PASSWORD, NULL, 0); + sendAuthRequest(AUTH_REQ_PASSWORD, NULL, 0); passwd = recv_password_packet(port); if (passwd == NULL) @@ -2561,7 +2561,7 @@ CheckLDAPAuth(Port *port) port->hba->ldapport = LDAP_PORT; } - sendAuthRequest(port, AUTH_REQ_PASSWORD, NULL, 0); + sendAuthRequest(AUTH_REQ_PASSWORD, NULL, 0); passwd = recv_password_packet(port); if (passwd == NULL) @@ -2910,7 +2910,7 @@ CheckRADIUSAuth(Port *port) } /* Send regular password request to client, and get the response */ - sendAuthRequest(port, AUTH_REQ_PASSWORD, NULL, 0); + sendAuthRequest(AUTH_REQ_PASSWORD, NULL, 0); passwd = recv_password_packet(port); if (passwd == NULL) -- 2.20.1