Remove sr_check_password and health_check_password from pool_status

for security reason.
Fix release notes about health_check_password.

diff --git a/NEWS b/NEWS
index 138828c7311fd32f881e3ce1b208353c93f9e368..c2bb12106360a292c15e25a039e6df2483fd15fb 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -71,9 +71,7 @@
                backend behavior. Currently "ALLOW_TO_FAILOVER" or
                "DISALLOW_TO_FAILOVER" are allowed(Tatsuo)
 
-         - Add health_check_password directive because the directives of
-               helthcheck are used to check replication delay in streaming
-               replication mode(Nicolas Thauvin)
+         - Add health_check_password directive(Nicolas Thauvin)
 
          - Add sr_check_period, sr_check_user and sr_check_password directives.
                These are used for streaming replication delay checking and

diff --git a/doc/pgpool-ja.html b/doc/pgpool-ja.html
index a0133faaa53183ab66d15b8cfd7a1a67acc000e1..17cecef8619955415266dbc214d88e3c2e283c4d 100644 (file)
--- a/doc/pgpool-ja.html
+++ b/doc/pgpool-ja.html
@@ -4016,7 +4016,7 @@ pgpool-II\e$B$N%A%e!<%H%j%"%k$O\e(B<a href="tutorial-ja.html">\e$B$3$3\e(B<a/>\e$B$K$
  <li>pcp_promote_node\e$B%3%^%s%I$rDI2C$7$^$7$?!#$3$N%3%^%s%I$O\e(Bpgpool-II\e$B$KBP$7$F?7$7$$%^%9%?%N!<%I$X$N>:3J$r9T$$$^$9!#$3$l$O!"%^%9%?!<%9%l!<%V%b!<%I$N%9%H%j!<%_%s%0%l%W%j%1!<%7%g%s9=@.$N$_$G;HMQ$G$-$^$9!#%Q%C%A$O\e(BGilles Darold\e$B$5$s$+$iD:$-$^$7$?\e(B(Kitagawa)
  <li>pcp_pool_status\e$B%3%^%s%I$rDI2C$7$^$7$?!#$^$?!"BP1~$9$k\e(BC API\e$B$bDI2C$5$l$F$$$^$9!#%Q%C%A$O\e(BJehan-Guillaume (ioguix) de Rorthais\e$B$5$s$+$iD:$-$^$7$?\e(B(Tatsuo)
  <li>\e$B%P%C%/%(%s%I$4$H$N%Q%i%a!<%?\e(B&quot;backend_flag&quot;\e$B$rDI2C$7$^$7$?!#$3$l$O!"%P%C%/%(%s%I$4$H$NF0:n$r@)8f$7$^$9!#:#$O\e(B&quot;ALLOW_TO_FAILOVER&quot;\e$B$^$?$O\e(B&quot;DISALLOW_TO_FAILOVER&quot;\e$B$,;XDj$G$-$^$9\e(B(Tatsuo)
- <li>\e$B%9%H%j!<%_%s%0%l%W%j%1!<%7%g%s%b!<%I$N%l%W%j%1!<%7%g%sCY1d%A%'%C%/$G%X%k%9%A%'%C%/$N%Q%i%a!<%?$,;HMQ$5$l$k$?$a!"\e(Bhealth_check_password\e$B%Q%i%a!<%?$rDI2C$7$^$7$?\e(B(Nicolas Thauvin)
+ <li>health_check_password\e$B%Q%i%a!<%?$rDI2C$7$^$7$?\e(B(Nicolas Thauvin)
  <li>sr_check_period\e$B!"\e(Bsr_check_user\e$B!"\e(Bsr_check_password\e$B%Q%i%a!<%?$rDI2C$7$^$7$?!#$3$l$i$O!"%9%H%j!<%_%s%0%l%W%j%1!<%7%g%s$NCY1d%A%'%C%/$H%W%i%$%^%j%N!<%I$N7hDj$K;HMQ$5$l$^$9\e(B(Tatsuo)
  <li>pg_md5\e$B%3%^%s%I$K\e(B--username(\e$B$^$?$O\e(B-u)\e$B%*%W%7%g%s$rDI2C$7$^$7$?!#$3$l$O!"\e(BUNIX\e$B%"%+%&%s%H$r;}$?$J$$%f!<%6$N4IM}$r2DG=$K$7$^$9!#F|K\8l%I%-%e%a%s%H$O\e(BTatsuo Ishii\e$B$5$s$,=$@5$7$^$7$?\e(B(Nicolas Thauvin)
  <li>pgpool_adm\e$B4X?t$r\e(Bpgpool_adm/\e$B$KDI2C$7$^$7$?!#$3$l$i$O!"\e(Bpcp\e$B%3%^%s%I$N$h$&$KF0:n$9$k\e(BC\e$B8@8l$G=q$+$l$?%f!<%6Dj5A4X?t$G$9\e(B(Jehan-Guillaume (ioguix) de Rorthais)

diff --git a/pool_process_reporting.c b/pool_process_reporting.c
index c3e837d3ebc431e59650c78ad53f31f6abbe3607..53c801f0d8a388a03ba1867a57d007f5d36917ca 100644 (file)
--- a/pool_process_reporting.c
+++ b/pool_process_reporting.c
@@ -323,12 +323,12 @@ POOL_REPORT_CONFIG* get_config(int *nrows)
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->sr_check_user);
        strncpy(status[i].desc, "sr check user", POOLCONFIG_MAXDESCLEN);
        i++;
-
+#ifdef NOT_USED        /* for security reason */
        strncpy(status[i].name, "sr_check_password", POOLCONFIG_MAXNAMELEN);
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->sr_check_password);
        strncpy(status[i].desc, "sr check password", POOLCONFIG_MAXDESCLEN);
        i++;
-
+#endif
        strncpy(status[i].name, "delay_threshold", POOLCONFIG_MAXNAMELEN);
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%lld", pool_config->delay_threshold);
        strncpy(status[i].desc, "standby delay threshold", POOLCONFIG_MAXDESCLEN);
@@ -358,12 +358,12 @@ POOL_REPORT_CONFIG* get_config(int *nrows)
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->health_check_user);
        strncpy(status[i].desc, "health check user", POOLCONFIG_MAXDESCLEN);
        i++;
-
+#ifdef NOT_USED        /* for security reason */
        strncpy(status[i].name, "health_check_password", POOLCONFIG_MAXNAMELEN);
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->health_check_password);
        strncpy(status[i].desc, "health check password", POOLCONFIG_MAXDESCLEN);
        i++;
-
+#endif
        strncpy(status[i].name, "failover_command", POOLCONFIG_MAXNAMELEN);
        snprintf(status[i].value, POOLCONFIG_MAXVALLEN, "%s", pool_config->failover_command);
        strncpy(status[i].desc, "failover command", POOLCONFIG_MAXDESCLEN);