pull up r17580 from trunk

ticket: 3318
version_fixed: 1.4.4

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-4@17719 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/windows/installer/wix/ChangeLog b/src/windows/installer/wix/ChangeLog
index 6eb2aa9a6e907b01d3db9e993db9a22f7621c30e..38f463566d59aa4f7e7069ab1f70fc3e587d7c8a 100644 (file)
--- a/src/windows/installer/wix/ChangeLog
+++ b/src/windows/installer/wix/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-30  Jeffrey Altman <jaltman@mit.edu>
+
+        Remove impersonation from the network provider installation
+        to allow installation on Vista
+
 2005-11-01  Jeffrey Altman <jaltman@mit.edu>
 
         Add support for Network Identity Manager Framework

diff --git a/src/windows/installer/wix/kfw.wxs b/src/windows/installer/wix/kfw.wxs
index f791feed6261ba7c44cae78284de29a171246999..667413c9e7198e791feb7892a18b4a5b89564675 100644 (file)
--- a/src/windows/installer/wix/kfw.wxs
+++ b/src/windows/installer/wix/kfw.wxs
@@ -124,14 +124,16 @@
           Id="InstallNetProvider"
           BinaryKey="binCustom"
           DllEntry="InstallNetProvider"
-          Execute="oncePerProcess" />
+          Impersonate="no"
+          Execute="deferred" />
 
         <CustomAction
           Id="RemoveNetProvider"
           BinaryKey="binCustom"
           DllEntry="UninstallNetProvider"
+          Impersonate="no"
           Return="ignore"
-          Execute="oncePerProcess" />
+          Execute="deferred" />
 
         <CustomAction
          Id="RollbackNetProvider"