Dr. Werner Fink 2011-10-24 08:29:48 +00:00 committed by Git OBS Bridge
parent af196acaa4
commit 668d935ca3
2 changed files with 19 additions and 3 deletions

View File

@ -56,6 +56,17 @@ if test -z "$SYSLOG_DAEMON" -o ! -x "$SBINDIR/$SYSLOG_DAEMON" ; then
done
fi
#
# Simple helper for correct permissions of the socket
#
touch ()
{
local mask=$(umask)
umask 0066
/bin/touch ${1+"$@"}
umask $mask
}
#
# Default is no network and start klogd
#
@ -94,7 +105,7 @@ syslog-ng)
done < $config
fi
/bin/mkdir -p -m 0755 ${socksdir#/var}
/bin/touch -m 0600 ${socks#/var}
touch ${socks#/var}
params="$SYSLOG_NG_PARAMS"
;;
rsyslogd)
@ -132,7 +143,7 @@ rsyslogd)
done < $config
fi
/bin/mkdir -p -m 0755 ${socksdir#/var}
/bin/touch -m 0600 ${socks#/var}
touch ${socks#/var}
compat=${RSYSLOGD_COMPAT_VERSION:-${RSYSLOGD_NATIVE_VERSION}}
params="-c ${compat:-3} -f $config $RSYSLOGD_PARAMS"
;;
@ -148,7 +159,7 @@ rsyslogd)
done < ${config}
fi
/bin/mkdir -p -m 0755 ${socksdir#/var}
/bin/touch -m 0600 ${socks#/var}
touch ${socks#/var}
params="$SYSLOGD_PARAMS"
esac

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 24 08:29:15 UTC 2011 - werner@suse.de
- Wrap touch command with correct umask (bnc#725875)
-------------------------------------------------------------------
Fri Oct 21 09:15:14 UTC 2011 - werner@suse.de