From 668d935ca3957edad3bfd9cd7c83448c9d97dc559d15ce4cfb7548a18d6e8a59 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 24 Oct 2011 08:29:48 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=67 --- syslog-service-generator | 17 ++++++++++++++--- syslogd.changes | 5 +++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/syslog-service-generator b/syslog-service-generator index 0835d8f..0f96a04 100644 --- a/syslog-service-generator +++ b/syslog-service-generator @@ -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 diff --git a/syslogd.changes b/syslogd.changes index 67e695f..9b13c6d 100644 --- a/syslogd.changes +++ b/syslogd.changes @@ -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