summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-08 21:46:07 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2006-06-08 21:46:07 +0000
commit09d2cd031ffdd16968c92710d6d56715866c334e (patch)
tree9319a6050d47ae793f4d874d99dafb9a3d103a1f /lib
parent1fc4ec373f8ee272077e2e78a380ac78879ffabe (diff)
downloadpuppet-09d2cd031ffdd16968c92710d6d56715866c334e.tar.gz
puppet-09d2cd031ffdd16968c92710d6d56715866c334e.tar.xz
puppet-09d2cd031ffdd16968c92710d6d56715866c334e.zip
Fixing #168. Reworked the regex to allow matching TLDs.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1248 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib')
-rwxr-xr-xlib/puppet/server/authstore.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/server/authstore.rb b/lib/puppet/server/authstore.rb
index 0573a2d36..3e7881162 100755
--- a/lib/puppet/server/authstore.rb
+++ b/lib/puppet/server/authstore.rb
@@ -210,7 +210,7 @@ class Server
when /^([a-zA-Z][-\w]*\.)+[-\w]+$/: # a full hostname
type = :hostname
value = pattern.split(".").reverse
- when /^\*\.([a-zA-Z][-\w]*\.)+[-\w]+$/: # this doesn't match TLDs
+ when /^\*(\.([a-zA-Z][-\w]*)){1,}$/:
type = :domain
value = pattern.split(".").reverse
else