SSPCPP-659 - shibd doesn't set any umask

[shibboleth/cpp-sp.git] / configs / shibd-amazon.in

diff --git a/configs/shibd-amazon.in b/configs/shibd-amazon.in
index 1668333..c4fb2ca 100644 (file)
--- a/configs/shibd-amazon.in
+++ b/configs/shibd-amazon.in
@@ -25,12 +25,15 @@
 
 shibd="@-PREFIX-@/sbin/shibd"
 SHIBD_USER=root
+SHIBD_UMASK=022
 prog=shibd
 pidfile=@-PKGRUNDIR-@/shibd.pid
 lockfile=/var/lock/subsys/$prog
 
 [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
 
+umask $SHIBD_UMASK
+
 start() {
        echo -n $"Starting $prog: "
        if [ -f $lockfile ] ; then
@@ -53,12 +56,9 @@ start() {
        chown $SHIBD_USER:$SHIBD_USER $pidfile
 
        # Handle transition from root to non-root packages.
-       chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ 2>/dev/null || :
+       chown -R $SHIBD_USER:$SHIBD_USER @-PKGRUNDIR-@ @-PKGCACHEDIR-@ 2>/dev/null || :
        daemon --user $SHIBD_USER $shibd -p $pidfile -f -w 30
 
-    # Adjust native logging directory permission so log roll-over works
-    chown apache:apache @-SHIRELOGDIR-@
-
        RETVAL=$?
        echo
                [ $RETVAL -eq 0 ] && touch $lockfile