From 0aa3b6683a37cee2a24dd8050e8242efe50856d5 Mon Sep 17 00:00:00 2001 From: shadoi Date: Fri, 16 Feb 2007 23:14:51 +0000 Subject: Change Puppet.name to Puppet.execname so rails 1.2 won't freak out. git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2202 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/network/server/servlet.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/puppet/network/server') diff --git a/lib/puppet/network/server/servlet.rb b/lib/puppet/network/server/servlet.rb index 0a7253eff..325956d8c 100644 --- a/lib/puppet/network/server/servlet.rb +++ b/lib/puppet/network/server/servlet.rb @@ -59,13 +59,13 @@ class Puppet::Network::Server # This means we can't actually test this method at this point. # The next release of Puppet will almost definitely require # this file to exist or will default to denying all access. - if Puppet.name == "puppetmasterd" or defined? Test::Unit::TestCase + if Puppet.execname == "puppetmasterd" or defined? Test::Unit::TestCase Puppet.debug "Allowing %s(%s) trusted access to %s" % [client, ip, method] return true else Puppet.debug "Denying %s(%s) trusted access to %s on %s" % - [client, ip, method, Puppet.name] + [client, ip, method, Puppet.execname] return false end end -- cgit