+1 On Dec 21, 2009, at 4:56 PM, Markus Roberts wrote:
> > Signed-off-by: Markus Roberts <[email protected]> > --- > lib/puppet/network/authstore.rb | 10 +++++----- > lib/puppet/network/handler/fileserver.rb | 1 + > 2 files changed, 6 insertions(+), 5 deletions(-) > > diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/ > authstore.rb > index a171537..796d3d8 100755 > --- a/lib/puppet/network/authstore.rb > +++ b/lib/puppet/network/authstore.rb > @@ -236,15 +236,15 @@ module Puppet > segments = value.split(".")[0..-2] > bits = 8*segments.length > [:ip,:inexact,bits,IPAddr.new((segments+[0,0,0]) > [0,4].join(".") + "/#{bits}")] > - when /^([a-zA-Z0-9][-\w]*\.)+[-\w]+ > $/ # a full hostname > - # Change to /^([a-zA-Z][-\w]*\.)+[-\w]+\.?$/ > for FQDN support > + when /^(\w[-\w]*\.)+[-\w]+ > $/ # a full hostname > + # Change to /^(\w[-\w]*\.)+[-\w]+\.?$/ for FQDN > support > [:domain,:exact,nil,munge_name(value)] > - when /^\*(\.([a-zA-Z][-\w]*)) > {1,}$/ # *.domain.com > + when /^\*(\.(\w[-\w]*)) > {1,}$/ # *.domain.com > host_sans_star = munge_name(value)[1..-1] > > [:domain,:inexact,host_sans_star.length,host_sans_star] > - when /\$\d > +/ # a backreference > pattern ala $1.reductivelabs.com or 192.168.0.$1 or $1.$2 > + when /\$\d > +/ # a backreference > pattern ala $1.reductivelabs.com or 192.168.0.$1 or $1.$2 > [:dynamic,:exact,nil,munge_name(value)] > - when /^[a-za-z0-9]...@\w]* > $/ # ? Just like a host name but allow > '@'s and ending '.'s > + when /^\w...@\w]* > $/ # ? Just like a host name > but allow '@'s and ending '.'s > [:opaque,:exact,nil,[value]] > else > raise AuthStoreError, "Invalid pattern %s" % value > diff --git a/lib/puppet/network/handler/fileserver.rb b/lib/puppet/ > network/handler/fileserver.rb > index 6bc6d9d..7049fb0 100755 > --- a/lib/puppet/network/handler/fileserver.rb > +++ b/lib/puppet/network/handler/fileserver.rb > @@ -310,6 +310,7 @@ class Puppet::Network::Handler > mount.info "allowing %s > access" % val > mount.allow(val) > rescue AuthStoreError => detail > + puts detail.backtrace if > Puppet[:trace] > raise > FileServerError.new(detail.to_s, > count, > @configuration.file) > end > -- > 1.6.4 > > -- > > You received this message because you are subscribed to the Google > Groups "Puppet Developers" group. > To post to this group, send email to [email protected]. > To unsubscribe from this group, send email to > [email protected] > . > For more options, visit this group at > http://groups.google.com/group/puppet-dev?hl=en > . > > -- Work is not always required. There is such a thing as sacred idleness. -- George MacDonald --------------------------------------------------------------------- Luke Kanies -|- http://reductivelabs.com -|- +1(615)594-8199 -- You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
