diff options
| -rwxr-xr-x | scripts/system/vyatta_update_syslog.pl | 2 | ||||
| -rw-r--r-- | templates/system/syslog/file/node.def | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/system/vyatta_update_syslog.pl b/scripts/system/vyatta_update_syslog.pl index 88791de5..49662c30 100755 --- a/scripts/system/vyatta_update_syslog.pl +++ b/scripts/system/vyatta_update_syslog.pl @@ -75,7 +75,7 @@ foreach my $host ( $config->listNodes('host') ) { } foreach my $file ( $config->listNodes('file') ) { - read_config( $config, "file $file", $file ); + read_config( $config, "file $file", '/var/log/user/' . $file ); } foreach my $user ( $config->listNodes('user') ) { diff --git a/templates/system/syslog/file/node.def b/templates/system/syslog/file/node.def index 2ff7e359..f8a57f66 100644 --- a/templates/system/syslog/file/node.def +++ b/templates/system/syslog/file/node.def @@ -1,7 +1,7 @@ tag: type: txt help: Set the name of syslog file to save log messages to -syntax:expression: pattern $VAR(@) "^\/" ; "File name must be full pathname with leading /" +syntax:expression: pattern $VAR(@) "^[-a-zA-Z0-9_.]+$" ; "invalid file name $VAR(@)" commit:expression: $VAR(./@/facility/@@) != ""; \ "At least one facility must be configured to log messages to file $VAR(./@)" comp_help: Full path name of log file with leading slash |