diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2016-05-24 14:18:55 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2016-05-24 14:23:03 +0200 |
| commit | 18487ed60ecf8d8e8416a45e1f45c3a012662ce7 (patch) | |
| tree | 2c6f0fb195337f3923c635938ac15858a0b0d04a /win | |
| parent | 964c4f070a7e96bf45979d8755beb10aa6e6617b (diff) | |
| download | mariadb-git-18487ed60ecf8d8e8416a45e1f45c3a012662ce7.tar.gz | |
MDEV-10108 Fix errors in installations by domain user
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 8ee2909511b..6e5d1bf0fb2 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' |