[tomcat7] 02/04: Hardened the init.d script, thanks to Paul Szabo

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository tomcat7.

commit 8d17ab8bc34ec040653e9c5f03eb23e7926ea3ae
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Oct 28 01:31:42 2016 +0200

    Hardened the init.d script, thanks to Paul Szabo
---
 debian/changelog    | 1 +
 debian/tomcat7.init | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c514330..8088a33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 tomcat7 (7.0.72-2) UNRELEASED; urgency=medium
 
+  * Hardened the init.d script, thanks to Paul Szabo
   * Switch to debhelper level 10
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 28 Oct 2016 01:24:20 +0200
diff --git a/debian/tomcat7.init b/debian/tomcat7.init
index b21ee58..37d670f 100644
--- a/debian/tomcat7.init
+++ b/debian/tomcat7.init
@@ -209,11 +209,11 @@ case "$1" in
 
 		# Remove / recreate JVM_TMP directory
 		rm -rf "$JVM_TMP"
-		mkdir -p "$JVM_TMP" || {
+		mkdir "$JVM_TMP" || {
 			log_failure_msg "could not create JVM temporary directory"
 			exit 1
 		}
-		chown $TOMCAT7_USER "$JVM_TMP"
+		chown -h $TOMCAT7_USER "$JVM_TMP"
 
 		catalina_sh start $SECURITY
 		sleep 5

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git