summaryrefslogtreecommitdiffstats
path: root/lib/puppet
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-11-09 10:30:18 -0800
committerJesse Wolfe <jes5199@gmail.com>2010-11-09 10:30:18 -0800
commit442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25 (patch)
tree9655feade127040613b1e366f7b7a498e925b4c4 /lib/puppet
parent04fb78c911965cc3059d71b356c7e90b4f90ee0d (diff)
parent5c2457952660e3e531e085757fd85c382676a96e (diff)
downloadpuppet-442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25.tar.gz
puppet-442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25.tar.xz
puppet-442a2e6b81f8cdcd2dc0ad24c7c2c66873148e25.zip
Merge branch 'maint/next/forkbomb' into next
Diffstat (limited to 'lib/puppet')
-rw-r--r--lib/puppet/util/monkey_patches.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/puppet/util/monkey_patches.rb b/lib/puppet/util/monkey_patches.rb
index 6b5af8350..bdce5ec1d 100644
--- a/lib/puppet/util/monkey_patches.rb
+++ b/lib/puppet/util/monkey_patches.rb
@@ -48,3 +48,11 @@ if RUBY_VERSION == '1.8.7'
end
end
+class Object
+ # ActiveSupport 2.3.x mixes in a dangerous method
+ # that can cause rspec to fork bomb
+ # and other strange things like that.
+ def daemonize
+ raise NotImplementedError, "Kernel.daemonize is too dangerous, please don't try to use it."
+ end
+end