mirrors
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Daniel Gustafsson 2024-09-03 11:33:38 +02:00
parent 2b5f57977f
commit 31a98934d1
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/storage/buffer/bufmgr.c
View File

@ -4741,7 +4741,7 @@ RelationCopyStorageUsingBuffer(RelFileLocator srclocator,
bstrategy_src = GetAccessStrategy(BAS_BULKREAD); bstrategy_src = GetAccessStrategy(BAS_BULKREAD);
bstrategy_dst = GetAccessStrategy(BAS_BULKWRITE); bstrategy_dst = GetAccessStrategy(BAS_BULKWRITE);
/* Initalize streaming read */ /* Initialize streaming read */
p.blocknum = 0; p.blocknum = 0;
p.nblocks = nblocks; p.nblocks = nblocks;
src_smgr = smgropen(srclocator, INVALID_PROC_NUMBER); src_smgr = smgropen(srclocator, INVALID_PROC_NUMBER);

2
src/bin/pg_combinebackup/pg_combinebackup.c
View File

@ -849,7 +849,7 @@ process_directory_recursively(Oid tsoid,
* *
* We set is_pg_wal for the toplevel WAL directory and all of its * We set is_pg_wal for the toplevel WAL directory and all of its
* subdirectories, because those files are not included in the backup * 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 * does not exist in pre-v10 versions, we don't have to worry about the
* old pg_xlog naming.) * old pg_xlog naming.)
* *

8
src/interfaces/libpq/t/005_negotiate_encryption.pl
View File

@ -240,7 +240,7 @@ testuser disable disable postgres connect, authok
. . require postgres connect, sslreject -> fail . . require postgres connect, sslreject -> fail
. . . direct connect, directsslreject -> 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 * * disable direct - -> fail
* * allow direct - -> fail * * allow direct - -> fail
* * prefer direct - -> fail * * prefer direct - -> fail
@ -303,7 +303,7 @@ nossluser . disable postgres connect, authok
. . require postgres connect, sslaccept, authfail -> fail . . require postgres connect, sslaccept, authfail -> fail
. . require direct connect, directsslaccept, 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 * * disable direct - -> fail
* * allow direct - -> fail * * allow direct - -> fail
* * prefer direct - -> fail * * prefer direct - -> fail
@ -405,7 +405,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 . . 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 . . . 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 * * disable direct - -> fail
* * allow direct - -> fail * * allow direct - -> fail
* * prefer direct - -> fail * * prefer direct - -> fail
@ -562,7 +562,7 @@ nossluser disable disable postgres connect, authok
. require * postgres connect, gssaccept, authok -> gss . require * postgres connect, gssaccept, authok -> gss
. . require direct 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 * * disable direct - -> fail
* * allow direct - -> fail * * allow direct - -> fail
* * prefer direct - -> fail * * prefer direct - -> fail