Attachment 659531 Details for Bug 884788 – Patch proposed v2

[patch] Patch proposed v2

0001-836984-fixes-the-permissions-on-var-log-osad-log-fil.patch (text/plain), 1.43 KB, created by Marcelo Moreira de Mello on 2012-12-07 18:27:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcelo Moreira de Mello

Created: 2012-12-07 18:27:31 UTC

Size: 1.43 KB

patch

obsolete

>From: Marcelo Moreira de Mello <mmello@redhat.com>
>Date: Fri, 7 Dec 2012 16:24:44 -0200
>Subject: [PATCH] 836984 - fixes the permissions on /var/log/osad log file
>
>---
> client/tools/osad/osad.spec      | 5 +++++
> client/tools/osad/src/rhn_log.py | 7 +++----
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
>index 57014b7..b954b59 100644
>--- a/client/tools/osad/osad.spec
>+++ b/client/tools/osad/osad.spec
>@@ -202,6 +202,11 @@ rm -rf $RPM_BUILD_ROOT
> if [ -f %{_sysconfdir}/init.d/osad ]; then
>     /sbin/chkconfig --add osad
> fi
>+
>+# Fix the /var/log/osad permission BZ 836984
>+if [ -f %{_var}/log/osad ]; then
>+    /bin/chmod 600 %{_var}/log/osad
>+fi
> %endif
> 
> %preun
>diff --git a/client/tools/osad/src/rhn_log.py b/client/tools/osad/src/rhn_log.py
>index 7b23501..3607c1a 100644
>--- a/client/tools/osad/src/rhn_log.py
>+++ b/client/tools/osad/src/rhn_log.py
>@@ -39,10 +39,9 @@ class Logger:
> 
>             if not Logger.logfile is None:
>                 try:
>-                    file = open( Logger.logfile, 'a' )
>-                    os.chmod(Logger.logfile, 0600)
>-                    file.write( outstring )
>-                    file.close()
>+                    fd = os.open(Logger.logfile, os.O_APPEND | os.O_RDWR | os.O_CREAT, 0600)
>+                    os.write(fd, outstring)
>+                    os.close(fd)
>                 except IOError:
>                     raise 
> 
>-- 
>1.8.0.1
>

Actions: View | Diff

Attachments on bug 884788: 658908 | 658932 | 659531