aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2013-10-18 17:24:51 -0300
committerRenato Botelho <garga@FreeBSD.org>2013-10-18 17:24:51 -0300
commitd199db0bc5bf99c77ec29d01edb646b7713cc9a8 (patch)
treec03967eac71e6f6349126890e759205402fe47f0
parentc3de17f094e67ede0eba8f3254c47e50da59ad2a (diff)
downloadpfsense-packages-d199db0bc5bf99c77ec29d01edb646b7713cc9a8.tar.gz
pfsense-packages-d199db0bc5bf99c77ec29d01edb646b7713cc9a8.tar.bz2
pfsense-packages-d199db0bc5bf99c77ec29d01edb646b7713cc9a8.zip
Stop using deprecated allowaddr parameter and check allowpass intead. Fixes #3248
-rw-r--r--config/nut/nut.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/config/nut/nut.inc b/config/nut/nut.inc
index 0c1235dd..46c5741e 100644
--- a/config/nut/nut.inc
+++ b/config/nut/nut.inc
@@ -272,7 +272,7 @@ EOD;
$upsd_users = "[monuser]\n";
$upsd_users .= "password = {$password}\n";
$upsd_users .= "upsmon master\n";
- if($allowaddr && $allowuser) {
+ if($allowuser && $allowpass) {
$upsd_users .= "\n[$allowuser]\n";
$upsd_users .= "password = $allowpass\n";
$upsd_users .= "upsmon master\n";
@@ -356,7 +356,6 @@ EOD;
$snmpcommunity = nut_config('snmpcommunity');
$snmpfreq = nut_config('snmpfreq');
$snmpdisabletransfer = (nut_config('snmpdisabletransfer') == 'on');
- $allowaddr = nut_config('allowaddr');
$allowuser = nut_config('allowuser');
$allowpass = nut_config('allowpass');
@@ -389,7 +388,7 @@ EOD;
$upsd_users = "[monuser]\n";
$upsd_users .= "password = {$password}\n";
$upsd_users .= "upsmon master\n";
- if($allowaddr && $allowuser) {
+ if($allowuser && $allowpass) {
$upsd_users .= "\n[$allowuser]\n";
$upsd_users .= "password = $allowpass\n";
$upsd_users .= "upsmon master\n";