diff options
| author | Markus Roberts <Markus@reality.com> | 2009-12-11 15:25:00 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-12 21:21:42 +1100 |
| commit | c2617211cf5037c5ddb7f59992c35c6dd62a529e (patch) | |
| tree | 4059be6700b55e59940bd11e6f2be16c49c01ce3 /lib/puppet/util | |
| parent | bf7d650a65bc4b97ac72ddf38647766229b3182e (diff) | |
| download | puppet-c2617211cf5037c5ddb7f59992c35c6dd62a529e.tar.gz puppet-c2617211cf5037c5ddb7f59992c35c6dd62a529e.tar.xz puppet-c2617211cf5037c5ddb7f59992c35c6dd62a529e.zip | |
Fix for #2911 (Allow capital letters in selinux contexts)
This is Matthias Saou's patch from the ticket; it adjusts the regular
expression to permit capital letters where needed.
Diffstat (limited to 'lib/puppet/util')
| -rw-r--r-- | lib/puppet/util/selinux.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/util/selinux.rb b/lib/puppet/util/selinux.rb index 3eff03996..f1336f946 100644 --- a/lib/puppet/util/selinux.rb +++ b/lib/puppet/util/selinux.rb @@ -73,7 +73,7 @@ module Puppet::Util::SELinux if context.nil? or context == "unlabeled" return nil end - unless context =~ /^([a-z0-9_]+):([a-z0-9_]+):([a-z0-9_]+)(?::([a-zA-Z0-9:,._-]+))?/ + unless context =~ /^([a-z0-9_]+):([a-z0-9_]+):([a-zA-Z0-9_]+)(?::([a-zA-Z0-9:,._-]+))?/ raise Puppet::Error, "Invalid context to parse: #{context}" end ret = { |