Roll out 2.3.2, fixes quoting problem notes by Glyn Astill

diff --git a/check_postgres.pl b/check_postgres.pl
index 6c2ab8c5ded4d4c37af420e90554534469752b92..bf5515b99577f68e997714d955156a5a6e73ea91 100755 (executable)
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -28,7 +28,7 @@ $Data::Dumper::Varname = 'POSTGRES';
 $Data::Dumper::Indent = 2;
 $Data::Dumper::Useqq = 1;
 
-our $VERSION = '2.3.1';
+our $VERSION = '2.3.2';
 
 use vars qw/ %opt $PSQL $res $COM $SQL $db /;
 
@@ -3344,10 +3344,10 @@ sub check_replicate_row {
        }
        my ($table,$pk,$id,$col,$val1,$val2) = (@repinfo);
 
-       ## Quote funky identifiers
-       $table = qq{"$table"} if $table !~ /^\w+$/;
-       $pk    = qq{"$pk"}    if $pk    !~ /^\w+$/;
-       $col   = qq{"$col"}   if $col   !~ /^\w+$/;
+       ## Quote everything, just to be safe (e.g. columns named 'desc')
+       $table = qq{"$table"};
+       $pk    = qq{"$pk"};
+       $col   = qq{"$col"};
 
        if ($val1 eq $val2) {
          ndie 'Makes no sense to test replication with same values';
@@ -3549,7 +3549,7 @@ sub check_sequence {
 =head1 NAME
 
 B<check_postgres.pl> - a Postgres monitoring script for Nagios, MRTG, and others
-This documents describes check_postgres.pl version 2.3.1
+This documents describes check_postgres.pl version 2.3.2
 
 =head1 SYNOPSIS
 
@@ -4690,6 +4690,10 @@ Items not specifically attributed are by Greg Sabino Mullane.
 
 =over 4
 
+=item B<Version 2.3.2>
+
+ Always quote identifiers in check_replicate_row action.
+
 =item B<Version 2.3.1>
 
  Give a better error if one of the databases cannot be reached.

diff --git a/check_postgres.pl.asc b/check_postgres.pl.asc
index 9b2a78559d1a16ea44b153fa49431d9bff114d1c..39f0eb1e6ae56ce243084675e99c34fb750a332a 100644 (file)
--- a/check_postgres.pl.asc
+++ b/check_postgres.pl.asc
@@ -1,6 +1,6 @@
 -----BEGIN PGP SIGNATURE-----
 
-iEYEABEDAAYFAkjrhvsACgkQvJuQZxSWSsgSEwCgy3WmBhnT+IDOHIS32D4KkWNk
-+OkAoMApAyuIV8zbL+7+QrVgSmxozNUt
-=tTHE
+iEYEABEDAAYFAkjsw6cACgkQvJuQZxSWSshhtQCfTE8t7CFn2Xfmtt8E/GoTvyOI
+kvoAoNYdHSGahtDWRINR8oRqEU+XOaqB
+=xyuQ
 -----END PGP SIGNATURE-----

diff --git a/check_postgres.pl.html b/check_postgres.pl.html
index 7ec4ee71444093aa133145e5b14f7c6af40e3006..43ea6c31e0b0b6ea1e21b86684032c8003b98277 100644 (file)
--- a/check_postgres.pl.html
+++ b/check_postgres.pl.html
@@ -90,7 +90,7 @@
 <hr />
 <h1><a name="name">NAME</a></h1>
 <p><strong>check_postgres.pl</strong> - a Postgres monitoring script for Nagios, MRTG, and others
-This documents describes check_postgres.pl version 2.3.1</p>
+This documents describes check_postgres.pl version 2.3.2</p>
 <p>
 </p>
 <hr />
@@ -1119,6 +1119,12 @@ feature requests, and commit notices, send email to <a href="mailto:check_postgr
 <h1><a name="history">HISTORY</a></h1>
 <p>Items not specifically attributed are by Greg Sabino Mullane.</p>
 <dl>
+<dt><strong><a name="item_version_2_2e3_2e2"><strong>Version 2.3.2</strong></a></strong></dt>
+
+<dd>
+<pre>
+ Always quote identifiers in check_replicate_row action.</pre>
+</dd>
 <dt><strong><a name="item_version_2_2e3_2e1"><strong>Version 2.3.1</strong></a></strong></dt>
 
 <dd>

diff --git a/index.html b/index.html
index e09fdf106785256c0677085346a017bc9a0a18ef..263293034aaf3e3da9737ab8364eda3914e4f499 100644 (file)
--- a/index.html
+++ b/index.html
@@ -21,14 +21,14 @@ h1 {
 
 <h1>check_postgres.pl</h1>
 
-<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.3.1</b>, and was released on October 07, 2008.</p>
+<p><b>check_postgres.pl</b> is a script for checking the state of one or more Postgres databases and reporting back in a Nagios-friendly manner. It was developed by Greg Sabino Mullane of <a href="http://www.endpoint.com/">End Point Corporation</a> and is BSD-licensed. The latest version is <b>2.3.2</b>, and was released on October 08, 2008.</p>
 
 <ul>
- <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.3.1</a></li>
+ <li><a href="/check_postgres/check_postgres.pl.html">Documentation for check_postgres 2.3.2</a></li>
 </ul>
 <ul>
- <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.3.1</a></li>
- <li><a href="/check_postgres/check_postgres.pl.asc">PGP signature for check_postgres.pl 2.3.1</a></li>
+ <li><a href="/check_postgres/check_postgres.pl">Download check_postgres.pl 2.3.2</a></li>
+ <li><a href="/check_postgres/check_postgres.pl.asc">PGP signature for check_postgres.pl 2.3.2</a></li>
 </ul>
 
 <p>The latest development version can be downloaded via git:</p>