From eec4d13bc85f716ee0444e2f3aa167f39a4cd776 Mon Sep 17 00:00:00 2001
From: Nozomi Anzai <anzai at sraoss.co.jp>
Date: Wed, 12 Oct 2011 04:32:49 +0000
Subject: [PATCH] - allow regex values as black_function_list and
 white_function_list - change default boolean value true/false -> 'on'/'off'

---
 definePgpoolConfParam.php | 417 ++++++++++++++++++++------------------
 1 file changed, 216 insertions(+), 201 deletions(-)

diff --git a/definePgpoolConfParam.php b/definePgpoolConfParam.php
index 72127c2..b402910 100644
--- a/definePgpoolConfParam.php
+++ b/definePgpoolConfParam.php
@@ -26,9 +26,24 @@
 $pgpoolConfigParam = array();
 $pgpoolConfigBackendParam = array();
 
-$strreg = '^[0-9a-zA-Z_\-]+$';
-$dirreg = '^\/[0-9a-zA-Z\._\/\-]+$';
-$hostreg = "^[0-9a-zA-Z\._\-]*$";
+define('NUM_MAX', 65535);
+
+// regex kinds
+$strreg     = '^[0-9a-zA-Z_\-]+$';
+$dirreg     = '^\/[0-9a-zA-Z\._\/\-]+$';
+$hostreg    = '^[0-9a-zA-Z\._\-]*$';
+$sslreg     = '^(|\/[0-9a-zA-Z_\/\.\-]*)$';
+$commandreg = '^[0-9a-zA-Z_\/\.\-]*$';
+$addressreg = '^([0-9a-zA-Z\._\-]+|[\*]{1})$';
+$listreg    = '^[0-9a-zA-Z_,]*$';
+$queryreg   = '^[0-9a-zA-Z; ]+$';
+$userreg    = "^[0-9a-zA-Z_\.\-]+$";
+$anyelse    = '.*';
+
+function selectreg($lists)
+{
+    return '^['. implode('|', $lists). ']+$';
+}
 
 #------------------------------------------------------------------------------
 # CONNECTIONS
@@ -37,106 +52,106 @@ $hostreg = "^[0-9a-zA-Z\._\-]*$";
 # - pgpool Connection Settings -
 
 $key = 'listen_addresses';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='localhost';
-$pgpoolConfigParam[$key]['regexp'] = '^([0-9a-zA-Z\._\-]+|[\*]{1})$';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'localhost';
+$pgpoolConfigParam[$key]['regexp'] = $addressreg;
 
 $key = 'port';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='9999';
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 9999;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 $pgpoolConfigParam[$key]['min'] = 1024;
 
 $key = 'socket_dir';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='/tmp';
-$pgpoolConfigParam[$key]['regexp'] = "$dirreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '/tmp';
+$pgpoolConfigParam[$key]['regexp'] = $dirreg;
 
 # - pgpool Communication Manager Connection Settings -
 
 $key = 'pcp_port';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] =9898;
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 9898;
 $pgpoolConfigParam[$key]['min'] = 1024;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'pcp_timeout';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='10';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 10;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'pcp_socket_dir';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='/tmp';
-$pgpoolConfigParam[$key]['regexp'] = "$dirreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '/tmp';
+$pgpoolConfigParam[$key]['regexp'] = $dirreg;
 
 # - Backend Connection Settings -
 
 $key = 'backend_hostname';
-$pgpoolConfigBackendParam[$key]['type'] ='C';
-$pgpoolConfigBackendParam[$key]['default'] ='';
-$pgpoolConfigBackendParam[$key]['regexp'] = "^[0-9a-zA-Z\._\-]*$";
+$pgpoolConfigBackendParam[$key]['type'] = 'C';
+$pgpoolConfigBackendParam[$key]['default'] = '';
+$pgpoolConfigBackendParam[$key]['regexp'] = $hostreg;
 
 $key = 'backend_port';
-$pgpoolConfigBackendParam[$key]['type'] ='N';
-$pgpoolConfigBackendParam[$key]['default'] ='5432';
+$pgpoolConfigBackendParam[$key]['type'] = 'N';
+$pgpoolConfigBackendParam[$key]['default'] = 5432;
 $pgpoolConfigBackendParam[$key]['min'] = 1024;
-$pgpoolConfigBackendParam[$key]['max'] = 65535;
+$pgpoolConfigBackendParam[$key]['max'] = NUM_MAX;
 
 $key = 'backend_weight';
-$pgpoolConfigBackendParam[$key]['type'] ='F';
-$pgpoolConfigBackendParam[$key]['default'] ='1';
+$pgpoolConfigBackendParam[$key]['type'] = 'F';
+$pgpoolConfigBackendParam[$key]['default'] = 1;
 $pgpoolConfigBackendParam[$key]['min'] = 0.0;
 $pgpoolConfigBackendParam[$key]['max'] = 100.0;
 
 $key = 'backend_data_directory';
-$pgpoolConfigBackendParam[$key]['type'] ='C';
-$pgpoolConfigBackendParam[$key]['default'] ='';
-$pgpoolConfigBackendParam[$key]['regexp'] = ".*";
+$pgpoolConfigBackendParam[$key]['type'] = 'C';
+$pgpoolConfigBackendParam[$key]['default'] = '';
+$pgpoolConfigBackendParam[$key]['regexp'] = $anyelse;
 
 $key = 'backend_flag';
-$pgpoolConfigBackendParam[$key]['type'] ='C';
-$pgpoolConfigBackendParam[$key]['default'] ='ALLOW_TO_FAILOVER';
-$pgpoolConfigBackendParam[$key]['regexp'] = "^[ALLOW_TO_FAILOVER|DISALLOW_TO_FAILOVER]+$";
+$pgpoolConfigBackendParam[$key]['type'] = 'C';
+$pgpoolConfigBackendParam[$key]['default'] = 'ALLOW_TO_FAILOVER';
+$pgpoolConfigBackendParam[$key]['regexp'] = selectreg(array('ALLOW_TO_FAILOVER', 'DISALLOW_TO_FAILOVER'));
 
 # - Authentication -
 
 $key = 'enable_pool_hba';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'authentication_timeout';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='60';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 60;
 $pgpoolConfigParam[$key]['min'] = 0;
 $pgpoolConfigParam[$key]['max'] = 10000;
 
 # - SSL Connections -
 
 $key = 'ssl';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'ssl_key';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $sslreg;
 
 $key = 'ssl_cert';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $sslreg;
 
 $key = 'ssl_ca_cert';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $sslreg;
 
 $key = 'ssl_ca_cert_dir';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $sslreg;
 
 #------------------------------------------------------------------------------
 # POOLS
@@ -145,42 +160,42 @@ $pgpoolConfigParam[$key]['regexp'] = "^(|\/[0-9a-zA-Z_\/\.\-]*)$";
 # - Pool size -
 
 $key = 'num_init_children';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='32';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = '32';
 $pgpoolConfigParam[$key]['min'] = 1;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'max_pool';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='4';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 4;
 $pgpoolConfigParam[$key]['min'] = 1;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 # - Life time -
 
 $key = 'child_life_time';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='300';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 300;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'child_max_connections';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'connection_life_time';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'client_idle_limit';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 #------------------------------------------------------------------------------
 # LOGS
@@ -189,312 +204,312 @@ $pgpoolConfigParam[$key]['max'] = 65535;
 # - Where to log -
 
 $key = 'log_destination';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='stderr';
-$pgpoolConfigParam[$key]['regexp'] = "^[stderr|syslog]+$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'stderr';
+$pgpoolConfigParam[$key]['regexp'] = selectreg(array('stderr', 'syslog'));
 
 # - What to log -
 
 $key = 'print_timestamp';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] =true;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'on';
 
 $key = 'log_connections';
 $pgpoolConfigParam[$key]['type'] = 'B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'log_hostname';
 $pgpoolConfigParam[$key]['type'] = 'B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'log_statement';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'log_per_node_statement';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'log_standby_delay';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='none';
-$pgpoolConfigParam[$key]['regexp'] = "^[always|if_over_threshold|none]+$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'none';
+$pgpoolConfigParam[$key]['regexp'] = selectreg(array('always', 'if_over_threshold', 'none'));
 
 # - Syslog specific - 
 
 $key = 'syslog_facility';
-$pgpoolConfigBackendParam[$key]['type'] ='C';
+$pgpoolConfigBackendParam[$key]['type'] = 'C';
 $pgpoolConfigBackendParam[$key]['default'] = 'LOCAL0';
-$pgpoolConfigBackendParam[$key]['regexp'] = "^[0-9a-zA-Z\._\-]*$";
+$pgpoolConfigBackendParam[$key]['regexp'] = $strreg;
 
 $key = 'syslog_ident';
-$pgpoolConfigBackendParam[$key]['type'] ='C';
-$pgpoolConfigBackendParam[$key]['default'] ='pgpool';
-$pgpoolConfigBackendParam[$key]['regexp'] = "^[0-9a-zA-Z\._\-]*$";
+$pgpoolConfigBackendParam[$key]['type'] = 'C';
+$pgpoolConfigBackendParam[$key]['default'] = 'pgpool';
+$pgpoolConfigBackendParam[$key]['regexp'] = $strreg;
 
 # - Debug -
 
 $key = 'debug_level';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = '0';
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 #------------------------------------------------------------------------------
 # FILE LOCATIONS
 #------------------------------------------------------------------------------
 
 $key = 'pid_file_name';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='/var/run/pgpool/pgpool.pid';
-$pgpoolConfigParam[$key]['regexp'] = "$dirreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '/var/run/pgpool/pgpool.pid';
+$pgpoolConfigParam[$key]['regexp'] = $dirreg;
 
 $key = 'logdir';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='/tmp';
-$pgpoolConfigParam[$key]['regexp'] = "$dirreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '/tmp';
+$pgpoolConfigParam[$key]['regexp'] = $dirreg;
 
 #------------------------------------------------------------------------------
 # CONNECTION POOLING
 #------------------------------------------------------------------------------
 
 $key = 'connection_cache';
-$pgpoolConfigParam[$key]['type'] ='B';
+$pgpoolConfigParam[$key]['type'] = 'B';
 $pgpoolConfigParam[$key]['default'] =true;
 
 $key = 'reset_query_list';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='ABORT; DISCARD ALL';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z; ]+$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'ABORT; DISCARD ALL';
+$pgpoolConfigParam[$key]['regexp'] = $queryreg;
 
 #------------------------------------------------------------------------------
 # REPLICATION MODE
 #------------------------------------------------------------------------------
 
 $key = 'replication_mode';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'replicate_select';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'insert_lock';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'lobj_lock_table';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 # - Degenerate handling -
 
 $key = 'replication_stop_on_mismatch';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'failover_if_affected_tuples_mismatch';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 #------------------------------------------------------------------------------
 # LOAD BALANCING MODE
 #------------------------------------------------------------------------------
 
 $key = 'load_balance_mode';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'ignore_leading_white_space';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] =true;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = true;
 
 $key = 'white_function_list';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_,]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 $key = 'black_function_list';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_,]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 #------------------------------------------------------------------------------
 # MASTER/SLAVE MODE
 #------------------------------------------------------------------------------
 
 $key = 'master_slave_mode';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'master_slave_sub_mode';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='slony';
-$pgpoolConfigParam[$key]['regexp'] = "^[slony|stream]+$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'slony';
+$pgpoolConfigParam[$key]['regexp'] = selectreg(array('slony', 'stream'));
 
 # - Streaming -
 
 $key = 'sr_check_period';
-$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['type'] = 'N';
 $pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'sr_check_user';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_,]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $listreg;
 
 $key = 'sr_check_password';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_,]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $listreg;
 
 $key = 'delay_threshold';
-$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['type'] = 'N';
 $pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 # - Special commands -
 $key = 'follow_master_command';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 #------------------------------------------------------------------------------
 # PARALLEL MODE AND QUERY CACHE
 #------------------------------------------------------------------------------
 
 $key = 'parallel_mode';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'enable_query_cache';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] = false;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'off';
 
 $key = 'pgpool2_hostname';
-$pgpoolConfigParam[$key]['type'] ='C';
+$pgpoolConfigParam[$key]['type'] = 'C';
 $pgpoolConfigParam[$key]['default'] = 'localhost';
 $pgpoolConfigParam[$key]['regexp'] = $hostreg;
 
 # - System DB info -
 
 $key = 'system_db_hostname';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='system_db_hostname';
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'system_db_hostname';
 $pgpoolConfigParam[$key]['regexp'] = $hostreg;
 
 $key = 'system_db_port';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] =5432;
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 5432;
 $pgpoolConfigParam[$key]['min'] = 1024;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'system_db_dbname';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='pgpool';
-$pgpoolConfigParam[$key]['regexp'] = "$strreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'pgpool';
+$pgpoolConfigParam[$key]['regexp'] = $strreg;
 
 $key = 'system_db_schema';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='pgpool_catalog';
-$pgpoolConfigParam[$key]['regexp'] = "$strreg";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'pgpool_catalog';
+$pgpoolConfigParam[$key]['regexp'] = $strreg;
 
 $key = 'system_db_user';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='pgpool';
-$pgpoolConfigParam[$key]['regexp'] =  "^[0-9a-zA-Z_\.\-]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'pgpool';
+$pgpoolConfigParam[$key]['regexp'] = $userreg;
 
 $key = 'system_db_password';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 #------------------------------------------------------------------------------
 # HEALTH CHECK
 #------------------------------------------------------------------------------
 
 $key = 'health_check_period';
-$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['type'] = 'N';
 $pgpoolConfigParam[$key]['default'] =0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'health_check_timeout';
-$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['type'] = 'N';
 $pgpoolConfigParam[$key]['default'] =20;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'health_check_user';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='nodoby';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\.\-]+$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'nodoby';
+$pgpoolConfigParam[$key]['regexp'] = $userreg;
 
 #------------------------------------------------------------------------------
 # FAILOVER AND FAILBACK
 #-----------------------------------------------------------------------------
 
 $key = 'failover_command';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 $key = 'failback_command';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 $key = 'fail_over_on_backend_error';
-$pgpoolConfigParam[$key]['type'] ='B';
-$pgpoolConfigParam[$key]['default'] =true;
+$pgpoolConfigParam[$key]['type'] = 'B';
+$pgpoolConfigParam[$key]['default'] = 'on';
 
 #------------------------------------------------------------------------------
 # ONLINE RECOVERY
 #------------------------------------------------------------------------------
 
 $key = 'recovery_user';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='nodoby';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = 'nodoby';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 $key = 'recovery_password';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = ".*";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $anyelse;
 
 $key = 'recovery_1st_stage_command';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\/\.\-]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $commandreg;
 
 $key = 'recovery_2nd_stage_command';
-$pgpoolConfigParam[$key]['type'] ='C';
-$pgpoolConfigParam[$key]['default'] ='';
-$pgpoolConfigParam[$key]['regexp'] = "^[0-9a-zA-Z_\/\.\-]*$";
+$pgpoolConfigParam[$key]['type'] = 'C';
+$pgpoolConfigParam[$key]['default'] = '';
+$pgpoolConfigParam[$key]['regexp'] = $commandreg;
 
 $key = 'recovery_timeout';
-$pgpoolConfigParam[$key]['type'] ='N';
+$pgpoolConfigParam[$key]['type'] = 'N';
 $pgpoolConfigParam[$key]['default'] = 90;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 $key = 'client_idle_limit_in_recovery';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = -1;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 
 #------------------------------------------------------------------------------
 # OTHERS
 #------------------------------------------------------------------------------
 
 $key = 'relcache_expire';
-$pgpoolConfigParam[$key]['type'] ='N';
-$pgpoolConfigParam[$key]['default'] ='0';
+$pgpoolConfigParam[$key]['type'] = 'N';
+$pgpoolConfigParam[$key]['default'] = 0;
 $pgpoolConfigParam[$key]['min'] = 0;
-$pgpoolConfigParam[$key]['max'] = 65535;
+$pgpoolConfigParam[$key]['max'] = NUM_MAX;
 ?>
-- 
2.39.5