summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhagbard <vyosdev@derith.de>2019-12-06 15:35:43 -0800
committerhagbard <vyosdev@derith.de>2019-12-06 15:35:43 -0800
commite9bf6cc7f20d93f35c2d7dc57c9a5a173fe7fc5d (patch)
tree101640b0263ee76e6159a83a2477321de9646935
parent699beffdfc69ab45c6d0e958a4dbf35f744f2a87 (diff)
parent9080dda455052203c5b53d9d1f8bf08156c9af51 (diff)
downloadvyos-1x-e9bf6cc7f20d93f35c2d7dc57c9a5a173fe7fc5d.tar.gz
vyos-1x-e9bf6cc7f20d93f35c2d7dc57c9a5a173fe7fc5d.zip
Merge branch 'current' into equuleus
-rwxr-xr-xsrc/conf_mode/system-syslog.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/system-syslog.py b/src/conf_mode/system-syslog.py
index 4f0a54962..15533afab 100755
--- a/src/conf_mode/system-syslog.py
+++ b/src/conf_mode/system-syslog.py
@@ -186,6 +186,7 @@ def get_config():
# set system syslog host
if c.exists('host'):
rhosts = c.list_nodes('host')
+ proto = 'udp'
for rhost in rhosts:
for fac in c.list_nodes('host ' + rhost + ' facility'):
if c.exists('host ' + rhost + ' facility ' + fac + ' protocol'):
@@ -303,7 +304,6 @@ def verify(c):
for s in c[conf][item]['selectors'].split(";"):
f = re.sub("\..*$", "", s)
if f not in fac:
- print (c[conf])
raise ConfigError(
'Invalid facility ' + s + ' set in ' + conf + ' ' + item)
l = re.sub("^.+\.", "", s)