From d199db0bc5bf99c77ec29d01edb646b7713cc9a8 Mon Sep 17 00:00:00 2001
From: Renato Botelho <garga@FreeBSD.org>
Date: Fri, 18 Oct 2013 17:24:51 -0300
Subject: Stop using deprecated allowaddr parameter and check allowpass intead.
 Fixes #3248

---
 config/nut/nut.inc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'config/nut')

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";
-- 
cgit v1.2.3