From 8567a09b4e1816ccdd58786f912ee055accfbc93 Mon Sep 17 00:00:00 2001 From: Jelte Fennema-Nio Date: Fri, 21 Jun 2024 01:05:24 +0200 Subject: [PATCH v1 1/8] libpq: Use PqMsg macros in fe-auth.c In f4b54e1ed9 macros were introduced for protocol characters to improve readability of code. But these new macros were not used everywhere in fe-auth.c by accident. This fixes the final three places. --- src/interfaces/libpq/fe-auth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c index 256f596e6bb..b5b367f24d0 100644 --- a/src/interfaces/libpq/fe-auth.c +++ b/src/interfaces/libpq/fe-auth.c @@ -124,7 +124,7 @@ pg_GSS_continue(PGconn *conn, int payloadlen) * first or subsequent packet, just send the same kind of password * packet. */ - if (pqPacketSend(conn, 'p', + if (pqPacketSend(conn, PqMsg_GSSResponse, goutbuf.value, goutbuf.length) != STATUS_OK) { gss_release_buffer(&lmin_s, &goutbuf); @@ -324,7 +324,7 @@ pg_SSPI_continue(PGconn *conn, int payloadlen) */ if (outbuf.pBuffers[0].cbBuffer > 0) { - if (pqPacketSend(conn, 'p', + if (pqPacketSend(conn, PqMsg_GSSResponse, outbuf.pBuffers[0].pvBuffer, outbuf.pBuffers[0].cbBuffer)) { FreeContextBuffer(outbuf.pBuffers[0].pvBuffer); @@ -683,7 +683,7 @@ pg_SASL_continue(PGconn *conn, int payloadlen, bool final) /* * Send the SASL response to the server. */ - res = pqPacketSend(conn, 'p', output, outputlen); + res = pqPacketSend(conn, PqMsg_SASLResponse, output, outputlen); free(output); if (res != STATUS_OK) @@ -754,7 +754,7 @@ pg_password_sendauth(PGconn *conn, const char *password, AuthRequest areq) default: return STATUS_ERROR; } - ret = pqPacketSend(conn, 'p', pwd_to_send, strlen(pwd_to_send) + 1); + ret = pqPacketSend(conn, PqMsg_PasswordMessage, pwd_to_send, strlen(pwd_to_send) + 1); free(crypt_pwd); return ret; } base-commit: c5c82123d3050c3a5eef0f51e9783f1cc5004ba0 -- 2.34.1