From 75c5231a00f3a1cb84a18320f15fa0284d9b1235 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Tue, 3 Sep 2024 11:33:38 +0200 Subject: [PATCH 2/2] Fix typos in code comments and test data The typos in 005_negotiate_encryption.pl and pg_combinebackup.c shall be backported to v17 where they were introduced. Backpatch-through: v17 Discussion: https://postgr.es/m/Ztaj7BkN4658OMxF@paquier.xyz --- src/bin/pg_combinebackup/pg_combinebackup.c | 2 +- src/interfaces/libpq/t/005_negotiate_encryption.pl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bin/pg_combinebackup/pg_combinebackup.c b/src/bin/pg_combinebackup/pg_combinebackup.c index a29ed23f3e..ea47c0a369 100644 --- a/src/bin/pg_combinebackup/pg_combinebackup.c +++ b/src/bin/pg_combinebackup/pg_combinebackup.c @@ -849,7 +849,7 @@ process_directory_recursively(Oid tsoid, * * We set is_pg_wal for the toplevel WAL directory and all of its * subdirectories, because those files are not included in the backup - * manifest and hence need special treatement. (Since incremental backup + * manifest and hence need special treatment. (Since incremental backup * does not exist in pre-v10 versions, we don't have to worry about the * old pg_xlog naming.) * diff --git a/src/interfaces/libpq/t/005_negotiate_encryption.pl b/src/interfaces/libpq/t/005_negotiate_encryption.pl index c3f70d31bc..294730e360 100644 --- a/src/interfaces/libpq/t/005_negotiate_encryption.pl +++ b/src/interfaces/libpq/t/005_negotiate_encryption.pl @@ -239,7 +239,7 @@ testuser disable disable postgres connect, authok . . require postgres connect, sslreject -> fail . . . direct connect, directsslreject -> fail -# sslnegotiation=direct is not acccepted unless sslmode=require or stronger +# sslnegotiation=direct is not accepted unless sslmode=require or stronger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -302,7 +302,7 @@ nossluser . disable postgres connect, authok . . require postgres connect, sslaccept, authfail -> fail . . require direct connect, directsslaccept, authfail -> fail -# sslnegotiation=direct is not acccepted unless sslmode=require or stronger +# sslnegotiation=direct is not accepted unless sslmode=require or stronger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -376,7 +376,7 @@ nogssuser disable disable postgres connect, authok . . require postgres connect, gssaccept, authfail -> fail # If both GSSAPI and sslmode are required, and GSS is not available -> fail . . . direct connect, gssaccept, authfail -> fail # If both GSSAPI and sslmode are required, and GSS is not available -> fail -# sslnegotiation=direct is not acccepted unless sslmode=require or stronger +# sslnegotiation=direct is not accepted unless sslmode=require or stronger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail @@ -501,7 +501,7 @@ nossluser disable disable postgres connect, authok . require * postgres connect, gssaccept, authok -> gss . . require direct connect, gssaccept, authok -> gss -# sslnegotiation=direct is not acccepted unless sslmode=require or stronger +# sslnegotiation=direct is not accepted unless sslmode=require or stronger * * disable direct - -> fail * * allow direct - -> fail * * prefer direct - -> fail -- 2.45.2