From 3d14bd2563cc527f250eed8d6d83e3ff62318675 Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Thu, 1 Sep 2011 08:28:26 -0400 Subject: [PATCH] Fix "is db labeled test?" in chkselinuxenv script. Don't test whether the number of labels is numerically equal to zero; count(*) isn't going return zero anyway, and the current coding blows up if it returns an empty string or an error. --- contrib/sepgsql/chkselinuxenv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/sepgsql/chkselinuxenv b/contrib/sepgsql/chkselinuxenv index 640ec10643..a9425de88e 100755 --- a/contrib/sepgsql/chkselinuxenv +++ b/contrib/sepgsql/chkselinuxenv @@ -210,7 +210,7 @@ echo "ok" # template1 database must be labeled echo -n "checking for labels in template1 ... " NUM=`${CMD_PSQL} template1 -Atc 'SELECT count(*) FROM pg_catalog.pg_seclabel' 2>/dev/null` -if [ -z "${NUM}" -o "$NUM" -eq 0 ]; then +if [ -z "${NUM}" ]; then echo "failed" echo "" echo "In order to regression test sepgsql, initial labels must be assigned"