[Commits] 34f9fcc: MDEV-10108 Fix errors in installations by domain user

wlad at mariadb.com wlad at mariadb.com
Tue May 24 15:19:20 EEST 2016


revision-id: 34f9fcc576abac764d39ffcc7ac8174f0fb20dff (mariadb-5.5.49-13-g34f9fcc)
parent(s): 672bbcd7411b20e87eca7845aceed81f361d6424
author: Vladislav Vaintroub
committer: Vladislav Vaintroub
timestamp: 2016-05-24 14:18:55 +0200
message:

MDEV-10108 Fix errors in installations by domain user

---
 win/packaging/extra.wxs.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 8ee2909..6e5d1bf 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -66,6 +66,7 @@
     <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec"  Execute="immediate" Return="check" Impersonate="yes" />
 
 
+
     <!-- 
       User interface dialogs 
      -->
@@ -463,7 +464,7 @@
            Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@'
            Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/>
         <CreateFolder>
-          <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
+          <util:PermissionEx User="[LogonUser]" Domain="[USER_DOMAIN]" GenericAll="yes" />
           <util:PermissionEx User="NetworkService" GenericAll="yes" />
         </CreateFolder>
       </Component>
@@ -851,6 +852,7 @@
     <Property Id="ARPSYSTEMCOMPONENT" Value="1" Secure="yes" />
     <Property Id="ARPINSTALLLOCATION" Secure="yes"/>
     <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="InstallValidate"  Sequence="execute"/>
+    <SetProperty Id="USER_DOMAIN" Value="[%USERDOMAIN]" After="LaunchConditions" Sequence="first" />
     <Feature Id='ARPRegistryEntries'
           Title='Add or remove program entries'
           Description='Add or remove program entries'


More information about the commits mailing list