[tomcat6/f12/master] resolves: rhbz#641102

[Dave Knox]

commit df050836a5c692527bfe1ceca6a39f506a73e480
Author: david knox <dknox at 78-97-42-72.skybeam.com>
Date:   Tue Oct 12 11:19:56 2010 -0600

    resolves: rhbz#641102

 tomcat6-6.0.init |    4 ++--
 tomcat6.spec     |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/tomcat6-6.0.init b/tomcat6-6.0.init
index e4e9517..4123f1c 100644
--- a/tomcat6-6.0.init
+++ b/tomcat6-6.0.init
@@ -38,9 +38,9 @@ fi
 
 # For SELinux we need to use 'runuser' not 'su'
 if [ -x "/sbin/runuser" ]; then
-    SU="/sbin/runuser"
+    SU="/sbin/runuser -s /bin/sh"
 else
-    SU="/bin/su"
+    SU="/bin/su -s /bin/sh"
 fi
 
 # Get the tomcat config (use this for environment specific settings)
diff --git a/tomcat6.spec b/tomcat6.spec
index eaf2258..e21c072 100644
--- a/tomcat6.spec
+++ b/tomcat6.spec
@@ -55,7 +55,7 @@
 Name: tomcat6
 Epoch: 0
 Version: %{major_version}.%{minor_version}.%{micro_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Apache Servlet/JSP Engine, RI for Servlet %{servletspec}/JSP %{jspspec} API
 
 Group: Networking/Daemons
@@ -448,7 +448,7 @@ done
 # add the tomcat user and group
 %{_sbindir}/groupadd -g %{tcuid} -r tomcat 2>/dev/null || :
 %{_sbindir}/useradd -c "Apache Tomcat" -u %{tcuid} -g tomcat \
-    -s /bin/sh -r -d %{homedir} tomcat 2>/dev/null || :
+    -s /bin/nologin -r -d %{homedir} tomcat 2>/dev/null || :
 
 %post
 # install but don't activate
@@ -610,6 +610,9 @@ fi
 %{appdir}/sample
 
 %changelog
+* Tue Oct 12 2010 David Knox <dknox at redhat.com> 0:6.0.26-3
+- resolves: rhbz#641102
+
 * Thu Oct 07 2010 David Knox <dknox at redhat.com> 0:6.0.26-1
 - copied spec and patches from f13 to bring f12 up to date
 - with all tomcat6 fedora.