diff options
| author | Brice Figureau <brice-puppet@daysofwonder.com> | 2011-05-30 20:31:14 +0200 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-07-26 14:04:28 -0700 |
| commit | 6401dfe5602fd39cc59ec1f1b3822110e4ad864a (patch) | |
| tree | ccea4f33b572c998cd4770feab3e6959f354b7eb /lib/puppet/network | |
| parent | 0c385f1fb436ab6f667693d347f711470305a019 (diff) | |
| download | puppet-6401dfe5602fd39cc59ec1f1b3822110e4ad864a.tar.gz puppet-6401dfe5602fd39cc59ec1f1b3822110e4ad864a.tar.xz puppet-6401dfe5602fd39cc59ec1f1b3822110e4ad864a.zip | |
Fix #6026 - security file should support inline comments
Auth.conf, namespaceauth.conf and fileserver.conf were not supporting
trailing inlined comments.
Also this commit fixes some indentation and error management.
Signed-off-by: Brice Figureau <brice-puppet@daysofwonder.com>
Diffstat (limited to 'lib/puppet/network')
| -rw-r--r-- | lib/puppet/network/authconfig.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/authconfig.rb b/lib/puppet/network/authconfig.rb index 61fb24ded..1e486a2f9 100644 --- a/lib/puppet/network/authconfig.rb +++ b/lib/puppet/network/authconfig.rb @@ -102,7 +102,7 @@ module Puppet name = $3 if $2 == "path" name.chomp! right = newrights.newright(name, count, @file) - when /^\s*(allow|deny|method|environment|auth(?:enticated)?)\s+(.+)$/ + when /^\s*(allow|deny|method|environment|auth(?:enticated)?)\s+(.+?)(\s*#.*)?$/ parse_right_directive(right, $1, $2, count) else raise ConfigurationError, "Invalid line #{count}: #{line}" |