fixup.diff.txt

text/plain

Download

diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index b8b30284086..b33895b4f56 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -184,7 +184,6 @@ static void postgres_fdw_get_connections_internal(FunctionCallInfo fcinfo,
 												  enum pgfdwVersion api_version);
 static int	pgfdw_conn_check(PGconn *conn);
 static bool pgfdw_conn_checkable(void);
-
 static bool pgfdw_has_required_scram_options(const char **keywords, const char **values);
 
 /*
@@ -458,7 +457,7 @@ pgfdw_security_check(const char **keywords, const char **values, UserMapping *us
 	}
 
 	/*
-	 * Ok if SCRAM pass-through is being used and all required scram options
+	 * Ok if SCRAM pass-through is being used and all required SCRAM options
 	 * are set correctly. If pgfdw_has_required_scram_options returns true we
 	 * assume that UseScramPassthrough is also true since SCRAM options are
 	 * only set when UseScramPassthrough is enabled.
@@ -567,7 +566,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
 		values[n] = GetDatabaseEncodingName();
 		n++;
 
-		/* Add required SCRAM pass-through connection options if it's enable. */
+		/* Add required SCRAM pass-through connection options if it's enabled. */
 		if (MyProcPort->has_scram_keys && UseScramPassthrough(server, user))
 		{
 			int			len;
@@ -2509,14 +2508,14 @@ pgfdw_conn_checkable(void)
 #endif
 }
 
- /*
-  * Ensure that require_auth and scram keys are correctly set on values. SCRAM
-  * keys used to pass-through are coming from the initial connection from the
-  * client with the server.
-  *
-  * All required scram options are set by postgres_fdw, so we just need to
-  * ensure that these options are not overwritten by the user.
-  */
+/*
+ * Ensure that require_auth and SCRAM keys are correctly set on values. SCRAM
+ * keys used to pass-through are coming from the initial connection from the
+ * client with the server.
+ *
+ * All required SCRAM options are set by postgres_fdw, so we just need to
+ * ensure that these options are not overwritten by the user.
+ */
 static bool
 pgfdw_has_required_scram_options(const char **keywords, const char **values)
 {
@@ -2560,6 +2559,5 @@ pgfdw_has_required_scram_options(const char **keywords, const char **values)
 
 	has_scram_keys = has_scram_client_key && has_scram_server_key && MyProcPort->has_scram_keys;
 
-
 	return (has_scram_keys && has_require_auth);
 }