This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new e0e0781222 Use the full path when calling icacls.exe
e0e0781222 is described below
commit e0e07812224d327a321babb554f5a5758d30cc49
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed Jun 4 11:12:00 2025 +0100
Use the full path when calling icacls.exe
---
res/install-win/tomcat.nsi | 6 +++---
webapps/docs/changelog.xml | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/res/install-win/tomcat.nsi b/res/install-win/tomcat.nsi
index c554022d21..09dd2a0a83 100644
--- a/res/install-win/tomcat.nsi
+++ b/res/install-win/tomcat.nsi
@@ -379,7 +379,7 @@ Section -post
; S-1-5-11 Authenticated users
;
; Grant admins, LocalService and Local System full control full control
- nsExec::ExecToStack 'icacls "$INSTDIR" /inheritance:r /grant
*S-1-5-19:(OI)(CI)(F) /grant *S-1-5-32-544:(OI)(CI)(F) /grant
*S-1-5-18:(OI)(CI)(F)'
+ nsExec::ExecToStack '$SYSDIR\icacls "$INSTDIR" /inheritance:r /grant
*S-1-5-19:(OI)(CI)(F) /grant *S-1-5-32-544:(OI)(CI)(F) /grant
*S-1-5-18:(OI)(CI)(F)'
Pop $0
Pop $1
StrCmp $0 "0" SetGroupPermissionsOk
@@ -392,7 +392,7 @@ Section -post
ClearErrors
; Make the icon readable to all authenticated users so it appears correctly
in the uninstall UI
- nsExec::ExecToStack 'icacls "$INSTDIR\tomcat.ico" /inheritance:e /grant
*S-1-5-11:(R)'
+ nsExec::ExecToStack '$SYSDIR\icacls "$INSTDIR\tomcat.ico" /inheritance:e
/grant *S-1-5-11:(R)'
Pop $0
Pop $1
StrCmp $0 "0" SetIconPermissionsOk
@@ -405,7 +405,7 @@ Section -post
ClearErrors
; Make the uninstaller readable and executable to all authenticated users so
the user that installed Tomcat can also uninstall it
- nsExec::ExecToStack 'icacls "$INSTDIR\Uninstall.exe" /inheritance:e /grant
*S-1-5-11:(RX)'
+ nsExec::ExecToStack '$SYSDIR\icacls "$INSTDIR\Uninstall.exe" /inheritance:e
/grant *S-1-5-11:(RX)'
Pop $0
Pop $1
StrCmp $0 "0" SetUninstallerPermissionsOk
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index c9318fd572..f4402d9e64 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -191,6 +191,10 @@
<update>
Update Checkstyle to 10.25.0. (markt)
</update>
+ <fix>
+ Use the full path when the installer for Windows sets calls
+ <code>icacls.exe</code> to set file permissions. (markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
