summaryrefslogtreecommitdiffstats
path: root/lib/puppet/network/handler
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-18 21:03:18 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-06-18 21:03:18 +0000
commit099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f (patch)
tree34ac81add7aeb9cd48ac599a02255d15218d6e13 /lib/puppet/network/handler
parentf96ec6d7ab9d18d2068f388508d811c39973df1e (diff)
downloadpuppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.tar.gz
puppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.tar.xz
puppet-099bf6c582b8e68263f25c0430fcf3d5ac7b1b7f.zip
Fixing some failing tests.
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2616 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet/network/handler')
-rw-r--r--lib/puppet/network/handler/master.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/handler/master.rb b/lib/puppet/network/handler/master.rb
index 50c988917..e889c1ba8 100644
--- a/lib/puppet/network/handler/master.rb
+++ b/lib/puppet/network/handler/master.rb
@@ -71,7 +71,7 @@ class Puppet::Network::Handler
host = Puppet::Rails::Host.find_or_create_by_name(client)
host.last_freshcheck = Time.now
- if clientip and (! host.ip or host.ip == "")
+ if clientip and (! host.ip or host.ip == "" or host.ip == "NULL")
host.ip = clientip
end
host.save