equal
deleted
inserted
replaced
1 Add auditing support to agent execution |
1 Add auditing support to agent execution |
2 |
2 |
3 --- puppet-3.6.2/lib/puppet/agent.rb.orig 2014-06-18 09:30:30.571283131 -0600 |
3 --- puppet-3.8.6/lib/puppet/agent.rb.orig 2016-04-19 14:23:14.948120246 -0700 |
4 +++ puppet-3.6.2/lib/puppet/agent.rb 2014-06-16 10:47:24.851029500 -0600 |
4 +++ puppet-3.8.6/lib/puppet/agent.rb 2016-04-19 14:24:09.178244630 -0700 |
5 @@ -1,4 +1,7 @@ |
5 @@ -1,4 +1,11 @@ |
|
6 +####################################################################### |
|
7 +# Oracle has modified the originally distributed contents of this file. |
|
8 +####################################################################### |
|
9 + |
6 require 'puppet/application' |
10 require 'puppet/application' |
7 +if Facter.value(:osfamily) == "Solaris" |
11 +if Facter.value(:osfamily) == "Solaris" |
8 + require 'PuppetAudit' |
12 + require 'PuppetAudit' |
9 +end |
13 +end |
10 |
14 |
11 # A general class for triggering a run of another |
15 # A general class for triggering a run of another |
12 # class. |
16 # class. |
13 @@ -37,6 +40,11 @@ |
17 @@ -37,6 +44,11 @@ |
14 return |
18 return |
15 end |
19 end |
16 |
20 |
17 + if Facter.value(:osfamily) == "Solaris" |
21 + if Facter.value(:osfamily) == "Solaris" |
18 + audit_handle = PuppetAudit.new |
22 + audit_handle = PuppetAudit.new |
20 + end |
24 + end |
21 + |
25 + |
22 result = nil |
26 result = nil |
23 block_run = Puppet::Application.controlled_run do |
27 block_run = Puppet::Application.controlled_run do |
24 splay client_options.fetch :splay, Puppet[:splay] |
28 splay client_options.fetch :splay, Puppet[:splay] |
25 @@ -52,6 +60,10 @@ |
29 @@ -52,6 +64,10 @@ |
26 end |
30 end |
27 end |
31 end |
28 end |
32 end |
29 + if Facter.value(:osfamily) == "Solaris" |
33 + if Facter.value(:osfamily) == "Solaris" |
30 + audit_handle.audit_stop |
34 + audit_handle.audit_stop |