Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 118ec0d

Browse files
committed
Canonicalize preload_libraries after it is split up, not before.
1 parent 0589ab6 commit 118ec0d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

src/backend/utils/init/miscinit.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.128 2004/07/11 23:49:48 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.129 2004/07/12 00:09:06 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -926,6 +926,7 @@ process_preload_libraries(char *preload_libraries_string)
926926
funcname = NULL;
927927
}
928928

929+
canonicalize_path(filename);
929930
initfunc = (func_ptr) load_external_function(filename, funcname,
930931
true, NULL);
931932
if (initfunc)

src/backend/utils/misc/guc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* Written by Peter Eisentraut <peter_e@gmx.net>.
1111
*
1212
* IDENTIFICATION
13-
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.217 2004/07/11 23:49:51 momjian Exp $
13+
* $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.218 2004/07/12 00:09:07 momjian Exp $
1414
*
1515
*--------------------------------------------------------------------
1616
*/
@@ -1557,7 +1557,7 @@ static struct config_string ConfigureNamesString[] =
15571557
GUC_LIST_INPUT | GUC_LIST_QUOTE
15581558
},
15591559
&preload_libraries_string,
1560-
"", assign_canonical_path, NULL
1560+
"", NULL, NULL
15611561
},
15621562

15631563
{

0 commit comments

Comments
 (0)