Re: [Spacewalk-devel] [PATCH] - BZ#836984 - fixes the permissions on /var/log/osad log file

2012-12-10 Thread Jan Pazdziora 
On Fri, Dec 07, 2012 at 04:26:49PM -0200, Marcelo Moreira de Mello wrote:
 On 12/07/2012 05:20 AM, Jan Pazdziora wrote:
   Hello Folks,
   
  Here follow a better looking patch.  Please, ignore the previous one.
  [...]
 
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()
  Either patch will fail with
 
  TypeError: close() takes exactly 1 argument (0 given)
 
 Hello Jan,
  
Thanks for heads up.
 
 Follow attached an updated version.

Pushed to Spacewalk master. Thank you,

-- 
Jan Pazdziora
Principal Software Engineer, Satellite Engineering, Red Hat

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Re: [Spacewalk-devel] [PATCH] - BZ#836984 - fixes the permissions on /var/log/osad log file

2012-12-07 Thread Marcelo Moreira de Mello 
On 12/07/2012 05:20 AM, Jan Pazdziora wrote:
  Hello Folks,
  
 Here follow a better looking patch.  Please, ignore the previous one.
 [...]

   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()
 Either patch will fail with

   TypeError: close() takes exactly 1 argument (0 given)

Hello Jan,
 
   Thanks for heads up.

Follow attached an updated version.

Thank you.

 Best,
mmello

-- 
Marcelo Moreira de Mello
RHCA RHCSS RHCVA
Senior Software Maintenance Engineer/SEG

gpg id: 2048R/FDB110E5
gpg fingerprint: 3BE7 EF71 4DD7 6812 D309  8F18 BD42 D095 FDB1 10E5

From: Marcelo Moreira de Mello mme...@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

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

[Spacewalk-devel] [PATCH] - BZ#836984 - fixes the permissions on /var/log/osad log file

2012-12-06 Thread Marcelo Moreira de Mello 
Hello Folks,
 
   Follow attach a patch which addressed the issue reported on BZ#836984.

   Thank you.

Best Regards,
mmello

-- 
Marcelo Moreira de Mello
RHCA RHCSS RHCVA
Senior Software Maintenance Engineer/SEG

gpg id: 2048R/FDB110E5
gpg fingerprint: 3BE7 EF71 4DD7 6812 D309  8F18 BD42 D095 FDB1 10E5

From: Marcelo Moreira de Mello mme...@redhat.com
Date: Thu, 6 Dec 2012 15:33:55 -0200
Subject: [PATCH] 836984 - fixes the permissions on /var/log/osad log file

---
 client/tools/osad/osad.spec  | 7 +++
 client/tools/osad/src/rhn_log.py | 7 +++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 57014b7..eaa0a8e 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -276,6 +276,13 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvi {}
 /sbin/restorecon -vvi /var/log/rhn/osa-dispatcher.log
 %endif
 
+# Fix the /var/log/osad permission BZ 836984
+%post
+if [ -f %{_var}/log/osad ]; then
+/bin/chmod 600 %{_var}/log/osad
+fi
+%endif
+
 %files
 %dir %{rhnroot}/osad
 %attr(755,root,root) %{_sbindir}/osad
diff --git a/client/tools/osad/src/rhn_log.py b/client/tools/osad/src/rhn_log.py
index 7b23501..0b1f85d 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()
 except IOError:
 raise 
 
-- 
1.8.0.1

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel

Re: [Spacewalk-devel] [PATCH] - BZ#836984 - fixes the permissions on /var/log/osad log file

2012-12-06 Thread Marcelo Moreira de Mello 
On 12/06/2012 03:42 PM, Marcelo Moreira de Mello wrote:

 Hello Folks,

   Here follow a better looking patch.  Please, ignore the previous one.

   Thank you.

Best,
mmello

-- 
Marcelo Moreira de Mello
RHCA RHCSS RHCVA
Senior Software Maintenance Engineer/SEG

gpg id: 2048R/FDB110E5
gpg fingerprint: 3BE7 EF71 4DD7 6812 D309  8F18 BD42 D095 FDB1 10E5

From: Marcelo Moreira de Mello mme...@redhat.com
Date: Thu, 6 Dec 2012 15:58:03 -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..0b1f85d 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()
 except IOError:
 raise 
 
-- 
1.8.0.1

___
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel