From 54f411c36f4a5d67ce281a43ae2223ddc99e080b Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Fri, 15 May 2026 15:21:31 +0900 Subject: [PATCH] Simplify signature of ProcessStartupPacket() There is now only one caller of ProcessStartupPacket(), so let's simplify the routine so as the GSS and SSL states are tracked inside it. If future callers are added, there is less guessing to do. Suggested-by: Daniel Gustafsson --- src/backend/tcop/backend_startup.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/backend/tcop/backend_startup.c b/src/backend/tcop/backend_startup.c index a810e41a9040..25205cee0fa6 100644 --- a/src/backend/tcop/backend_startup.c +++ b/src/backend/tcop/backend_startup.c @@ -59,7 +59,7 @@ ConnectionTiming conn_timing = {.ready_for_use = TIMESTAMP_MINUS_INFINITY}; static void BackendInitialize(ClientSocket *client_sock, CAC_state cac); static int ProcessSSLStartup(Port *port); -static int ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done); +static int ProcessStartupPacket(Port *port); static void ProcessCancelRequestPacket(Port *port, void *pkt, int pktlen); static void SendNegotiateProtocolVersion(List *unrecognized_protocol_options); static void process_startup_packet_die(SIGNAL_ARGS); @@ -292,7 +292,7 @@ BackendInitialize(ClientSocket *client_sock, CAC_state cac) * packet). */ if (status == STATUS_OK) - status = ProcessStartupPacket(port, false, false); + status = ProcessStartupPacket(port); /* * If we're going to reject the connection due to database state, say so @@ -481,20 +481,27 @@ reject: * send anything to the client, which would typically be appropriate * if we detect a communications failure.) * - * Set ssl_done and/or gss_done when negotiation of an encrypted layer - * (currently, TLS or GSSAPI) is completed. A successful negotiation of either - * encryption layer sets both flags, but a rejected negotiation sets only the - * flag for that layer, since the client may wish to try the other one. We - * should make no assumption here about the order in which the client may make - * requests. */ static int -ProcessStartupPacket(Port *port, bool ssl_done, bool gss_done) +ProcessStartupPacket(Port *port) { int32 len; char *buf = NULL; ProtocolVersion proto; MemoryContext oldcontext; + bool gss_done; + bool ssl_done; + + /* + * Set ssl_done and/or gss_done when negotiation of an encrypted layer + * (currently, TLS or GSSAPI) is completed. A successful negotiation of + * either encryption layer sets both flags, but a rejected negotiation + * sets only the flag for that layer, since the client may wish to try the + * other one. We should make no assumption here about the order in which + * the client may make requests. + */ + gss_done = false; + ssl_done = false; retry: pq_startmsgread(); -- 2.54.0