NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6bbd8b7

committed

Use AbsoluteConfigLocation() when building an included path in hba.c

The code building an absolute path to a file included, as prefixed by'@' in authentication files, for user and database lists uses the samelogic as for GUCs, except that it has no need to know about DataDir asthere is always a calling file to rely to build the base directory path.The refactoring done ina1a7bb8 makes this move straight-forward, andunifies the code used for GUCs and authentication files, and theintention is to rely also on that for the upcoming patch to be able toinclude full files from HBA or ident files.Note that this gets rid of an inconsistency introduced in370f909, thatcopied the logic coming from GUCs but applied it for files included inauthentication files, where the result buffer given tojoin_path_components() must have a size of MAXPGPATH. Based on adouble-check of the existing code, all the other callers ofjoin_path_components() already do that, except the code path changedhere.Discussion:https://postgr.es/m/Y2igk7q8OMpg+Yta@paquier.xyz

1 parentf05a5e0 commit6bbd8b7Copy full SHA for 6bbd8b7

File tree

2 files changed

-17

lines changed

src/backend
- libpq
  - hba.c
- utils/misc
  - conffiles.c

2 files changed

-17

lines changed

`‎src/backend/libpq/hba.c`

Lines changed: 2 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,7 @@`
`41`	`41`	`#include"storage/fd.h"`
`42`	`42`	`#include"utils/acl.h"`
`43`	`43`	`#include"utils/builtins.h"`
	`44`	`+#include"utils/conffiles.h"`
`44`	`45`	`#include"utils/guc.h"`
`45`	`46`	`#include"utils/lsyscache.h"`
`46`	`47`	`#include"utils/memutils.h"`
`@@ -466,21 +467,7 @@ tokenize_inc_file(List *tokens,`
`466`	`467`	`ListCell*inc_line;`
`467`	`468`	`MemoryContextlinecxt;`
`468`	`469`
`469`		`-if (is_absolute_path(inc_filename))`
`470`		`-{`
`471`		`-/* absolute path is taken as-is */`
`472`		`-inc_fullname=pstrdup(inc_filename);`
`473`		`-}`
`474`		`-else`
`475`		`-{`
`476`		`-/* relative path is relative to dir of calling file */`
`477`		`-inc_fullname= (char*)palloc(strlen(outer_filename)+1+`
`478`		`-strlen(inc_filename)+1);`
`479`		`-strcpy(inc_fullname,outer_filename);`
`480`		`-get_parent_directory(inc_fullname);`
`481`		`-join_path_components(inc_fullname,inc_fullname,inc_filename);`
`482`		`-canonicalize_path(inc_fullname);`
`483`		`-}`
	`470`	`+inc_fullname=AbsoluteConfigLocation(inc_filename,outer_filename);`
`484`	`471`
`485`	`472`	`inc_file=AllocateFile(inc_fullname,"r");`
`486`	`473`	`if (inc_file==NULL)`

`‎src/backend/utils/misc/conffiles.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,12 +35,12 @@`
`35`	`35`	`char*`
`36`	`36`	`AbsoluteConfigLocation(constcharlocation,constcharcalling_file)`
`37`	`37`	`{`
`38`		`-charabs_path[MAXPGPATH];`
`39`		`-`
`40`	`38`	`if (is_absolute_path(location))`
`41`	`39`	`returnpstrdup(location);`
`42`	`40`	`else`
`43`	`41`	`{`
	`42`	`+charabs_path[MAXPGPATH];`
	`43`	`+`
`44`	`44`	`if (calling_file!=NULL)`
`45`	`45`	`{`
`46`	`46`	`strlcpy(abs_path,calling_file,sizeof(abs_path));`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit6bbd8b7

File tree

2 files changed

2 files changed

`‎src/backend/libpq/hba.c`

`‎src/backend/utils/misc/conffiles.c`

0 commit comments