Allow to specify absolute path in "pool_passwd".

Patch is provided by Danylo Hlynskyi.

diff --git a/doc.ja/src/sgml/connection-settings.sgml b/doc.ja/src/sgml/connection-settings.sgml
index 1600dd95d681a439556b865cf69fb5b951db1c68..2e5f5835ebc01d4e491743bb6dd7c50a97b4d064 100644 (file)
--- a/doc.ja/src/sgml/connection-settings.sgml
+++ b/doc.ja/src/sgml/connection-settings.sgml
@@ -449,13 +449,16 @@
     <listitem>
      <para>
       <!--
-      Specify the password file name for authentication.
-      Default value is <literal>"pool_passwd"</literal>.
+      Specify the path (absolute or relative) to password file for
+      authentication. Default value is <literal>"pool_passwd"</literal>.
+      A relative path will be interpreted with respect to the directory
+      where configuration file is placed.
       Specifying <literal>''</literal> (empty) disables the use
       of password file.
       -->
-      認証に用いるパスワードファイルのファイル名を指定します。
-      デフォルト値は<literal>"pool_passwd"</literal>です。
+      認証用のパスワードファイルへのパス(絶対パスまたは相対パス)を指定します。 
+      デフォルト値は<literal>"pool_passwd"</literal>です。 
+      相対パスは、設定ファイルが置かれているディレクトリを基準としています。
       <literal>''</literal>（空文字列）を指定すると パスワードファイルの使用は無効になります。
      </para>
      <para>

diff --git a/doc/src/sgml/connection-settings.sgml b/doc/src/sgml/connection-settings.sgml
index ba84e75bdce3541f7b7b9e927a18495e41a07c4d..2fe5051f744c90394d94682ec92d3b76a23954e8 100644 (file)
--- a/doc/src/sgml/connection-settings.sgml
+++ b/doc/src/sgml/connection-settings.sgml
@@ -290,8 +290,10 @@
     </term>
     <listitem>
      <para>
-      Specify the password file name for authentication.
-      Default value is <literal>"pool_passwd"</literal>.
+      Specify the path (absolute or relative) to password file for
+      authentication. Default value is <literal>"pool_passwd"</literal>.
+      A relative path will be interpreted with respect to the directory
+      where configuration file is placed.
       Specifying <literal>''</literal> (empty) disables the use
       of password file.
      </para>

diff --git a/src/main/main.c b/src/main/main.c
index eec3c3e4868e4772d675d59fb8b54b8297988e4d..9b55f3d4dde7d6f1943622101b132054af62afe0 100644 (file)
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -337,10 +337,17 @@ 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);
        }