diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-06-04 00:13:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-04 00:13:01 +0000 |
| commit | 9ebf890b3fc684564ca833fa925a451b0fe8992b (patch) | |
| tree | ba9ac765e47b6a868210758a24b3b4a25d8c1c2e /pkgs/servers/sql/pgpool/pgpool.patch | |
| parent | 0e5d12d65c5cb5260c2f1b00d7bf90fba213cba2 (diff) | |
| parent | 628d7a800c19958a9919d1aea4bc498559ee65bc (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/servers/sql/pgpool/pgpool.patch')
| -rw-r--r-- | pkgs/servers/sql/pgpool/pgpool.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/pkgs/servers/sql/pgpool/pgpool.patch b/pkgs/servers/sql/pgpool/pgpool.patch deleted file mode 100644 index 7c9d92a88bf7d..0000000000000 --- a/pkgs/servers/sql/pgpool/pgpool.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/main/main.c b/src/main/main.c -index eec3c3e4..4169112b 100644 ---- a/src/main/main.c -+++ b/src/main/main.c -@@ -337,10 +337,14 @@ main(int argc, char **argv) - char dirnamebuf[POOLMAXPATHLEN + 1]; - char *dirp; - -- strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); -- dirp = dirname(dirnamebuf); -- snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", -- dirp, pool_config->pool_passwd); -+ if (pool_config->pool_passwd[0] != '/') { -+ strlcpy(dirnamebuf, conf_file, sizeof(dirnamebuf)); -+ dirp = dirname(dirnamebuf); -+ snprintf(pool_passwd, sizeof(pool_passwd), "%s/%s", -+ dirp, pool_config->pool_passwd); -+ } else -+ strlcpy(pool_passwd, pool_config->pool_passwd, -+ sizeof(pool_passwd)); - pool_init_pool_passwd(pool_passwd, POOL_PASSWD_R); - } - |