Firewall:aliases prevent pfctl error messages from being suppressed. closes https://github.com/opnsense/core/issues/4266

This commit is contained in:
Ad Schellevis 2020-08-16 10:55:21 +02:00
parent 5a141a79c9
commit 80696b3be7
2 changed files with 2 additions and 2 deletions

View File

@ -163,7 +163,7 @@ if __name__ == '__main__':
sp = subprocess.run(['/sbin/pfctl', '-t', alias_name, '-T', 'replace', '-f',
'/var/db/aliastables/%s.txt' % alias_name], capture_output=True, text=True)
error_output = sp.stdout.strip()
error_output = sp.stderr.strip()
if error_output.find('pfctl: ') > -1:
result['status'] = 'error'
if 'messages' not in result:

View File

@ -497,7 +497,7 @@ $.fn.SimpleActionButton = function (params) {
if (params && params.onAction) {
params.onAction(data, status);
}
if (status != "success" || data['status'].toLowerCase().trim() != 'ok') {
if ((status != "success" || data['status'].toLowerCase().trim() != 'ok') && data['status']) {
BootstrapDialog.show({
type: BootstrapDialog.TYPE_WARNING,
title: this_button.data('error-title'),