--- rpms/e-smith-nutUPS/sme9/e-smith-nutUPS-2.4.0.UPS_administrative_privileges.patch	2015/02/03 21:15:48	1.2
+++ rpms/e-smith-nutUPS/sme9/e-smith-nutUPS-2.4.0.UPS_administrative_privileges.patch	2015/02/07 10:18:12	1.4
@@ -14,14 +14,18 @@ diff -Nur e-smith-nutUPS-2.4.0.old8826/r
  }
 diff -Nur e-smith-nutUPS-2.4.0.old8826/root/etc/e-smith/templates/etc/hosts.allow/upsd_admin_privileges e-smith-nutUPS-2.4.0.bz8826/root/etc/e-smith/templates/etc/hosts.allow/upsd_admin_privileges
 --- e-smith-nutUPS-2.4.0.old8826/root/etc/e-smith/templates/etc/hosts.allow/upsd_admin_privileges	1970-01-01 01:00:00.000000000 +0100
-+++ e-smith-nutUPS-2.4.0.bz8826/root/etc/e-smith/templates/etc/hosts.allow/upsd_admin_privileges	2015-02-03 22:00:31.228971082 +0100
-@@ -0,0 +1,7 @@
++++ e-smith-nutUPS-2.4.0.bz8826/root/etc/e-smith/templates/etc/hosts.allow/upsd_admin_privileges	2015-02-07 10:41:37.038033536 +0100
+@@ -0,0 +1,11 @@
 +{
++return "# The upsd admin is not allowed" if ($nut{AdminUser} ne 'enabled');
++return "# The upsd admin has no password" if (($nut{AdminPass} || '') eq '');
++return "# The upsd admin is not allowed when nut access is set to public" if $nut{access} eq 'public';
++
 +my $upsd = $DB->hosts_allow_spec('nut','upsd');
-+$upsd =~ s|upsd:|upsd: admin op localhost :|;
++$upsd =~ s|upsd:|upsd: admin op |;
 +
 +$OUT .= qq(#Allow the Admin User of upsd
-+$upsd\n) if ($nut{AdminUser} eq 'enabled');
++$upsd : ALLOW) if ($nut{status} eq 'enabled');
 +}
 diff -Nur e-smith-nutUPS-2.4.0.old8826/root/etc/e-smith/templates/etc/ups/upsd.users/upsd_administrative_privileges e-smith-nutUPS-2.4.0.bz8826/root/etc/e-smith/templates/etc/ups/upsd.users/upsd_administrative_privileges
 --- e-smith-nutUPS-2.4.0.old8826/root/etc/e-smith/templates/etc/ups/upsd.users/upsd_administrative_privileges	1970-01-01 01:00:00.000000000 +0100