diff --git a/spec/integration/util/windows/security_spec.rb b/spec/integration/util/windows/security_spec.rb
index f7e93cd7c..fcc14778f 100755
--- a/spec/integration/util/windows/security_spec.rb
+++ b/spec/integration/util/windows/security_spec.rb
@@ -1,433 +1,457 @@
 #!/usr/bin/env ruby
 require 'spec_helper'
 
 require 'puppet/util/adsi'
 
 if Puppet.features.microsoft_windows?
   class WindowsSecurityTester
     require 'puppet/util/windows/security'
     include Puppet::Util::Windows::Security
   end
 end
 
 describe "Puppet::Util::Windows::Security", :if => Puppet.features.microsoft_windows? do
   include PuppetSpec::Files
 
   before :all do
     sid = nil
 
     wql = Puppet::Util::ADSI.execquery("select Sid from win32_account where name='#{Sys::Admin.get_login}'")
     wql.each do |u|
       sid = u.Sid
       break
     end
 
     @sids = {
       :current_user => sid,
       :admin => Sys::Admin.get_user("Administrator").sid,
       :guest => Sys::Admin.get_user("Guest").sid,
 
       :users => Win32::Security::SID::BuiltinUsers,
       :power_users => Win32::Security::SID::PowerUsers,
     }
   end
 
   let (:sids) { @sids }
   let (:winsec) { WindowsSecurityTester.new }
 
   shared_examples_for "a securable object" do
     describe "for a normal user" do
       before :each do
         Puppet.features.stubs(:root?).returns(false)
       end
 
       after :each do
         winsec.set_mode(WindowsSecurityTester::S_IRWXU, path)
       end
 
       describe "when setting the owner sid" do
         it "should allow setting to the current user" do
           winsec.set_owner(sids[:current_user], path)
         end
 
         it "should raise an exception when setting to a different user" do
           lambda { winsec.set_owner(sids[:guest], path) }.should raise_error(Puppet::Error, /This security ID may not be assigned as the owner of this object./)
         end
       end
 
       describe "when getting the owner sid" do
         it "it should not be empty" do
           winsec.get_owner(path).should_not be_empty
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.get_owner("c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "when setting the group sid" do
         it "should allow setting to a group the current owner is a member of" do
           winsec.set_group(sids[:users], path)
         end
 
         # Unlike unix, if the user has permission to WRITE_OWNER, which the file owner has by default,
         # then they can set the primary group to a group that the user does not belong to.
         it "should allow setting to a group the current owner is not a member of" do
           winsec.set_group(sids[:power_users], path)
         end
       end
 
       describe "when getting the group sid" do
         it "should not be empty" do
           winsec.get_group(path).should_not be_empty
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.get_group("c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "setting the mode" do
         [0000, 0100, 0200, 0300, 0400, 0500, 0600, 0700].each do |mode|
           it "should enforce mode #{mode.to_s(8)}" do
             winsec.set_mode(mode, path)
 
             check_access(mode, path)
           end
         end
 
         it "should round-trip all 64 modes that do not require deny ACEs" do
           0.upto(7).each do |u|
             0.upto(u).each do |g|
               0.upto(g).each do |o|
                 # if user is superset of group, and group superset of other, then
                 # no deny ace is required, and mode can be converted to win32
                 # access mask, and back to mode without loss of information
                 # (provided the owner and group are not the same)
                 next if ((u & g) != g) or ((g & o) != o)
 
                 mode = (u << 6 | g << 3 | o << 0)
                 winsec.set_mode(mode, path)
                 winsec.get_mode(path).to_s(8).should == mode.to_s(8)
               end
             end
           end
         end
 
         describe "for modes that require deny aces" do
           it "should map everyone to group and owner" do
             winsec.set_mode(0426, path)
             winsec.get_mode(path).to_s(8).should == "666"
           end
 
           it "should combine user and group modes when owner and group sids are equal" do
             winsec.set_group(winsec.get_owner(path), path)
 
             winsec.set_mode(0410, path)
             winsec.get_mode(path).to_s(8).should == "550"
           end
         end
 
         describe "for read-only objects" do
           before :each do
             winsec.add_attributes(path, WindowsSecurityTester::FILE_ATTRIBUTE_READONLY)
             (winsec.get_attributes(path) & WindowsSecurityTester::FILE_ATTRIBUTE_READONLY).should be_nonzero
           end
 
           it "should make them writable if any sid has write permission" do
             winsec.set_mode(WindowsSecurityTester::S_IWUSR, path)
             (winsec.get_attributes(path) & WindowsSecurityTester::FILE_ATTRIBUTE_READONLY).should == 0
           end
 
           it "should leave them read-only if no sid has write permission" do
             winsec.set_mode(WindowsSecurityTester::S_IRUSR | WindowsSecurityTester::S_IXGRP, path)
             (winsec.get_attributes(path) & WindowsSecurityTester::FILE_ATTRIBUTE_READONLY).should be_nonzero
           end
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.set_mode(sids[:guest], "c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "getting the mode" do
         it "should report when extra aces are encounted" do
+          winsec.set_acl(path, true) do |acl|
+            [ 544, 545, 546, 547 ].each do |rid|
+              winsec.add_access_allowed_ace(acl, WindowsSecurityTester::STANDARD_RIGHTS_ALL, "S-1-5-32-#{rid}")
+            end
+          end
           mode = winsec.get_mode(path)
           (mode & WindowsSecurityTester::S_IEXTRA).should_not == 0
         end
 
         it "should warn if a deny ace is encountered" do
           winsec.set_acl(path) do |acl|
             winsec.add_access_denied_ace(acl, WindowsSecurityTester::FILE_GENERIC_WRITE, sids[:guest])
             winsec.add_access_allowed_ace(acl, WindowsSecurityTester::STANDARD_RIGHTS_ALL | WindowsSecurityTester::SPECIFIC_RIGHTS_ALL, sids[:current_user])
           end
 
           Puppet.expects(:warning).with("Unsupported access control entry type: 0x1")
 
           winsec.get_mode(path)
         end
 
         it "should skip inherit-only ace" do
           winsec.set_acl(path) do |acl|
             winsec.add_access_allowed_ace(acl, WindowsSecurityTester::STANDARD_RIGHTS_ALL | WindowsSecurityTester::SPECIFIC_RIGHTS_ALL, sids[:current_user])
             winsec.add_access_allowed_ace(acl, WindowsSecurityTester::FILE_GENERIC_READ, Win32::Security::SID::Everyone, WindowsSecurityTester::INHERIT_ONLY_ACE | WindowsSecurityTester::OBJECT_INHERIT_ACE)
           end
 
           (winsec.get_mode(path) & WindowsSecurityTester::S_IRWXO).should == 0
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.get_mode("c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "inherited access control entries" do
         it "should be absent when the access control list is protected" do
           winsec.set_mode(WindowsSecurityTester::S_IRWXU, path)
           (winsec.get_mode(path) & WindowsSecurityTester::S_IEXTRA).should == 0
         end
 
         it "should be present when the access control list is unprotected" do
-          winsec.set_mode(WindowsSecurityTester::S_IRWXU, path, false)
-          (winsec.get_mode(path) & WindowsSecurityTester::S_IEXTRA).should == WindowsSecurityTester::S_IEXTRA
+          dir = tmpdir('win_sec_parent')
+
+          # add a bunch of aces, make sure we can add to the directory
+          allow = WindowsSecurityTester::STANDARD_RIGHTS_ALL | WindowsSecurityTester::SPECIFIC_RIGHTS_ALL
+          inherit = WindowsSecurityTester::OBJECT_INHERIT_ACE | WindowsSecurityTester::CONTAINER_INHERIT_ACE
+
+          winsec.set_acl(dir, true) do |acl|
+            winsec.add_access_allowed_ace(acl, allow, "S-1-1-0", inherit) # everyone
+
+            [ 544, 545, 546, 547 ].each do |rid|
+              winsec.add_access_allowed_ace(acl, WindowsSecurityTester::STANDARD_RIGHTS_ALL, "S-1-5-32-#{rid}", inherit)
+            end
+          end
+
+          # add a file
+          child = File.join(dir, "child")
+          File.new(child, "w").close
+
+          # unprotect child, it should inherit from parent
+          winsec.set_mode(WindowsSecurityTester::S_IRWXU, child, false)
+          (winsec.get_mode(child) & WindowsSecurityTester::S_IEXTRA).should == WindowsSecurityTester::S_IEXTRA
         end
       end
     end
 
     describe "for an administrator", :if => Puppet.features.root? do
       before :each do
         winsec.set_owner(sids[:guest], path)
         winsec.set_group(sids[:guest], path)
         winsec.set_mode(WindowsSecurityTester::S_IRWXU | WindowsSecurityTester::S_IRWXG, path)
         lambda { File.open(path, 'r') }.should raise_error(Errno::EACCES)
       end
 
       after :each do
         winsec.set_owner(sids[:current_user], path)
         winsec.set_mode(WindowsSecurityTester::S_IRWXU, path)
       end
 
       describe "when setting the owner sid" do
         it "should accept a user sid" do
           winsec.set_owner(sids[:admin], path)
           winsec.get_owner(path).should == sids[:admin]
         end
 
         it "should accept a group sid" do
           winsec.set_owner(sids[:power_users], path)
           winsec.get_owner(path).should == sids[:power_users]
         end
 
         it "should raise an exception if an invalid sid is provided" do
           lambda { winsec.set_owner("foobar", path) }.should raise_error(Puppet::Error, /Failed to convert string SID/)
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.set_owner(sids[:guest], "c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "when setting the group sid" do
         it "should accept a group sid" do
           winsec.set_group(sids[:power_users], path)
           winsec.get_group(path).should == sids[:power_users]
         end
 
         it "should accept a user sid" do
           winsec.set_group(sids[:admin], path)
           winsec.get_group(path).should == sids[:admin]
         end
 
         it "should allow owner and group to be the same sid" do
           winsec.set_owner(sids[:power_users], path)
           winsec.set_group(sids[:power_users], path)
           winsec.set_mode(0610, path)
 
           winsec.get_owner(path).should == sids[:power_users]
           winsec.get_group(path).should == sids[:power_users]
           # note group execute permission added to user ace, and then group rwx value
           # reflected to match
           winsec.get_mode(path).to_s(8).should == "770"
         end
 
         it "should raise an exception if an invalid sid is provided" do
           lambda { winsec.set_group("foobar", path) }.should raise_error(Puppet::Error, /Failed to convert string SID/)
         end
 
         it "should raise an exception if an invalid path is provided" do
           lambda { winsec.set_group(sids[:guest], "c:\\doesnotexist.txt") }.should raise_error(Puppet::Error, /The system cannot find the file specified./)
         end
       end
 
       describe "when the sid is NULL" do
         it "should retrieve an empty owner sid"
         it "should retrieve an empty group sid"
       end
 
       describe "when the sid refers to a deleted trustee" do
         it "should retrieve the user sid" do
           sid = nil
           user = Puppet::Util::ADSI::User.create("delete_me_user")
           user.commit
           begin
             sid = Sys::Admin::get_user(user.name).sid
             winsec.set_owner(sid, path)
             winsec.set_mode(WindowsSecurityTester::S_IRWXU, path)
           ensure
             Puppet::Util::ADSI::User.delete(user.name)
           end
 
           winsec.get_owner(path).should == sid
           winsec.get_mode(path).should == WindowsSecurityTester::S_IRWXU
         end
 
         it "should retrieve the group sid" do
           sid = nil
           group = Puppet::Util::ADSI::Group.create("delete_me_group")
           group.commit
           begin
             sid = Sys::Admin::get_group(group.name).sid
             winsec.set_group(sid, path)
             winsec.set_mode(WindowsSecurityTester::S_IRWXG, path)
           ensure
             Puppet::Util::ADSI::Group.delete(group.name)
           end
           winsec.get_group(path).should == sid
           winsec.get_mode(path).should == WindowsSecurityTester::S_IRWXG
         end
       end
 
       describe "when getting the dacl" do
         it "should deny all access when the DACL is empty" do
           winsec.set_acl(path, true) { |acl| }
 
           winsec.get_mode(path).should == 0
         end
 
         # REMIND: ruby crashes when trying to set a NULL DACL
         # it "should allow all when it is nil" do
         #   winsec.set_owner(sids[:current_user], path)
         #   winsec.open_file(path, WindowsSecurityTester::READ_CONTROL | WindowsSecurityTester::WRITE_DAC) do |handle|
         #     winsec.set_security_info(handle, WindowsSecurityTester::DACL_SECURITY_INFORMATION | WindowsSecurityTester::PROTECTED_DACL_SECURITY_INFORMATION, nil)
         #   end
         #   winsec.get_mode(path).to_s(8).should == "777"
         # end
       end
     end
   end
 
   describe "file" do
     let :path do
       path = tmpfile('win_sec_test_file')
       File.new(path, "w").close
       path
     end
 
     it_behaves_like "a securable object" do
       def check_access(mode, path)
         if (mode & WindowsSecurityTester::S_IRUSR).nonzero?
           check_read(path)
         else
           lambda { check_read(path) }.should raise_error(Errno::EACCES)
         end
 
         if (mode & WindowsSecurityTester::S_IWUSR).nonzero?
           check_write(path)
         else
           lambda { check_write(path) }.should raise_error(Errno::EACCES)
         end
 
         if (mode & WindowsSecurityTester::S_IXUSR).nonzero?
           lambda { check_execute(path) }.should raise_error(Errno::ENOEXEC)
         else
           lambda { check_execute(path) }.should raise_error(Errno::EACCES)
         end
       end
 
       def check_read(path)
         File.open(path, 'r').close
       end
 
       def check_write(path)
         File.open(path, 'w').close
       end
 
       def check_execute(path)
         Kernel.exec(path)
       end
     end
 
     describe "locked files" do
       let (:explorer) { File.join(Dir::WINDOWS, "explorer.exe") }
 
       it "should get the owner" do
         winsec.get_owner(explorer).should match /^S-1-5-/
       end
 
       it "should get the group" do
         winsec.get_group(explorer).should match /^S-1-5-/
       end
 
       it "should get the mode" do
         winsec.get_mode(explorer).should == (WindowsSecurityTester::S_IRWXU | WindowsSecurityTester::S_IRWXG | WindowsSecurityTester::S_IEXTRA)
       end
     end
   end
 
   describe "directory" do
     let :path do
       tmpdir('win_sec_test_dir')
     end
 
     it_behaves_like "a securable object" do
       def check_access(mode, path)
         if (mode & WindowsSecurityTester::S_IRUSR).nonzero?
           check_read(path)
         else
           lambda { check_read(path) }.should raise_error(Errno::EACCES)
         end
 
         if (mode & WindowsSecurityTester::S_IWUSR).nonzero?
           check_write(path)
         else
           lambda { check_write(path) }.should raise_error(Errno::EACCES)
         end
 
         if (mode & WindowsSecurityTester::S_IXUSR).nonzero?
           check_execute(path)
         else
           lambda { check_execute(path) }.should raise_error(Errno::EACCES)
         end
       end
 
       def check_read(path)
         Dir.entries(path)
       end
 
       def check_write(path)
         Dir.mkdir(File.join(path, "subdir"))
       end
 
       def check_execute(path)
         Dir.chdir(path) {|dir| }
       end
     end
 
     describe "inheritable aces" do
       it "should be applied to child objects" do
         mode640 = WindowsSecurityTester::S_IRUSR | WindowsSecurityTester::S_IWUSR | WindowsSecurityTester::S_IRGRP
         winsec.set_mode(mode640, path)
 
         newfile = File.join(path, "newfile.txt")
         File.new(newfile, "w").close
 
         newdir = File.join(path, "newdir")
         Dir.mkdir(newdir)
 
         [newfile, newdir].each do |p|
           winsec.get_mode(p).to_s(8).should == mode640.to_s(8)
         end
       end
     end
   end
 end
diff --git a/spec/unit/util/adsi_spec.rb b/spec/unit/util/adsi_spec.rb
old mode 100644
new mode 100755
index b61724405..3a27cdaef
--- a/spec/unit/util/adsi_spec.rb
+++ b/spec/unit/util/adsi_spec.rb
@@ -1,202 +1,206 @@
 #!/usr/bin/env ruby
 
 require 'spec_helper'
 
 require 'puppet/util/adsi'
 
 describe Puppet::Util::ADSI do
   let(:connection) { stub 'connection' }
 
   before(:each) do
     Puppet::Util::ADSI.instance_variable_set(:@computer_name, 'testcomputername')
     Puppet::Util::ADSI.stubs(:connect).returns connection
   end
 
+  after(:each) do
+    Puppet::Util::ADSI.instance_variable_set(:@computer_name, nil)
+  end
+
   it "should generate the correct URI for a resource" do
     Puppet::Util::ADSI.uri('test', 'user').should == "WinNT://testcomputername/test,user"
   end
 
   it "should be able to get the name of the computer" do
     Puppet::Util::ADSI.computer_name.should == 'testcomputername'
   end
 
   it "should be able to provide the correct WinNT base URI for the computer" do
     Puppet::Util::ADSI.computer_uri.should == "WinNT://testcomputername"
   end
 
   describe Puppet::Util::ADSI::User do
     let(:username)  { 'testuser' }
 
     it "should generate the correct URI" do
       Puppet::Util::ADSI::User.uri(username).should == "WinNT://testcomputername/#{username},user"
     end
 
     it "should be able to create a user" do
       adsi_user = stub('adsi')
 
       connection.expects(:Create).with('user', username).returns(adsi_user)
 
       user = Puppet::Util::ADSI::User.create(username)
 
       user.should be_a(Puppet::Util::ADSI::User)
       user.native_user.should == adsi_user
     end
 
     it "should be able to check the existence of a user" do
       Puppet::Util::ADSI.expects(:connect).with("WinNT://testcomputername/#{username},user").returns connection
       Puppet::Util::ADSI::User.exists?(username).should be_true
     end
 
     it "should be able to delete a user" do
       connection.expects(:Delete).with('user', username)
 
       Puppet::Util::ADSI::User.delete(username)
     end
 
     describe "an instance" do
       let(:adsi_user) { stub 'user' }
       let(:user)      { Puppet::Util::ADSI::User.new(username, adsi_user) }
 
       it "should provide its groups as a list of names" do
         names = ["group1", "group2"]
 
         groups = names.map { |name| mock('group', :Name => name) }
 
         adsi_user.expects(:Groups).returns(groups)
 
         user.groups.should =~ names
       end
 
       it "should be able to test whether a given password is correct" do
         Puppet::Util::ADSI::User.expects(:logon).with(username, 'pwdwrong').returns(false)
         Puppet::Util::ADSI::User.expects(:logon).with(username, 'pwdright').returns(true)
 
         user.password_is?('pwdwrong').should be_false
         user.password_is?('pwdright').should be_true
       end
 
       it "should be able to set a password" do
         adsi_user.expects(:SetPassword).with('pwd')
         adsi_user.expects(:SetInfo).at_least_once
 
         flagname = "UserFlags"
         fADS_UF_DONT_EXPIRE_PASSWD = 0x10000
 
         adsi_user.expects(:Get).with(flagname).returns(0)
         adsi_user.expects(:Put).with(flagname, fADS_UF_DONT_EXPIRE_PASSWD)
 
         user.password = 'pwd'
       end
 
       it "should generate the correct URI" do
         user.uri.should == "WinNT://testcomputername/#{username},user"
       end
 
       describe "when given a set of groups to which to add the user" do
         let(:groups_to_set) { 'group1,group2' }
 
         before(:each) do
           user.expects(:groups).returns ['group2', 'group3']
         end
 
         describe "if membership is specified as inclusive" do
           it "should add the user to those groups, and remove it from groups not in the list" do
             group1 = stub 'group1'
             group1.expects(:Add).with("WinNT://testcomputername/#{username},user")
 
             group3 = stub 'group1'
             group3.expects(:Remove).with("WinNT://testcomputername/#{username},user")
 
             Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group1,group').returns group1
             Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group3,group').returns group3
 
             user.set_groups(groups_to_set, false)
           end
         end
 
         describe "if membership is specified as minimum" do
           it "should add the user to the specified groups without affecting its other memberships" do
             group1 = stub 'group1'
             group1.expects(:Add).with("WinNT://testcomputername/#{username},user")
 
             Puppet::Util::ADSI.expects(:connect).with('WinNT://testcomputername/group1,group').returns group1
 
             user.set_groups(groups_to_set, true)
           end
         end
       end
     end
   end
 
   describe Puppet::Util::ADSI::Group do
     let(:groupname)  { 'testgroup' }
 
     describe "an instance" do
       let(:adsi_group) { stub 'group' }
       let(:group)      { Puppet::Util::ADSI::Group.new(groupname, adsi_group) }
 
       it "should be able to add a member" do
         adsi_group.expects(:Add).with("WinNT://testcomputername/someone,user")
 
         group.add_member('someone')
       end
 
       it "should be able to remove a member" do
         adsi_group.expects(:Remove).with("WinNT://testcomputername/someone,user")
 
         group.remove_member('someone')
       end
 
       it "should provide its groups as a list of names" do
         names = ['user1', 'user2']
 
         users = names.map { |name| mock('user', :Name => name) }
 
         adsi_group.expects(:Members).returns(users)
 
         group.members.should =~ names
       end
 
       it "should be able to add a list of users to a group" do
         names = ['user1', 'user2']
         adsi_group.expects(:Members).returns names.map{|n| stub(:Name => n)}
 
         adsi_group.expects(:Remove).with('WinNT://testcomputername/user1,user')
         adsi_group.expects(:Add).with('WinNT://testcomputername/user3,user')
 
         group.set_members(['user2', 'user3'])
       end
 
       it "should generate the correct URI" do
         group.uri.should == "WinNT://testcomputername/#{groupname},group"
       end
     end
 
     it "should generate the correct URI" do
       Puppet::Util::ADSI::Group.uri("people").should == "WinNT://testcomputername/people,group"
     end
 
     it "should be able to create a group" do
       adsi_group = stub("adsi")
 
       connection.expects(:Create).with('group', groupname).returns(adsi_group)
 
       group = Puppet::Util::ADSI::Group.create(groupname)
 
       group.should be_a(Puppet::Util::ADSI::Group)
       group.native_group.should == adsi_group
     end
 
     it "should be able to confirm the existence of a group" do
       Puppet::Util::ADSI.expects(:connect).with("WinNT://testcomputername/#{groupname},group").returns connection
 
       Puppet::Util::ADSI::Group.exists?(groupname).should be_true
     end
 
     it "should be able to delete a group" do
       connection.expects(:Delete).with('group', groupname)
 
       Puppet::Util::ADSI::Group.delete(groupname)
     end
   end
 end