client/tools/osad/src/jabber_lib.py | 3 +++
client/tools/rhncfg/config_common/file_utils.py | 16 ++++++++++++++--
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
New commits:
commit 44719baf2100216b716fbd2ac457debfe216b157
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Oct 27 11:39:25 2009 +0100
Automatic commit of package [rhncfg] release [5.9.11-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 9d8b5a8..07cbb11 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.10
+Version: 5.9.11
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -105,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Oct 27 2009 Miroslav Suchy <msuchy(a)redhat.com> 5.9.11-1
+- Diff SELinux contexts (joshua.roys(a)gtri.gatech.edu)
+
* Wed Sep 02 2009 Michael Mraka <michael.mraka(a)redhat.com> 5.9.10-1
- Add symlink capability to config management (joshua.roys(a)gtri.gatech.edu)
- 519195 - fix typos in rhncfg-manager manual page
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 94ad1ff..3eed1e7 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.10-1 client/tools/rhncfg/
+5.9.11-1 client/tools/rhncfg/
commit 08b218ae7a49870c9e4290d257fc9bec5b6974bb
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Oct 26 11:35:12 2009 -0400
Make debugging osa* network/jabber issues easier
diff --git a/client/tools/osad/src/jabber_lib.py b/client/tools/osad/src/jabber_lib.py
index 5c615ae..344a91b 100644
--- a/client/tools/osad/src/jabber_lib.py
+++ b/client/tools/osad/src/jabber_lib.py
@@ -259,12 +259,15 @@ class Runner:
sys.exit(1)
except socket.error, e:
self.print_message(js, "socket error")
+ log_error(extract_traceback())
continue
except JabberError, e:
self.print_message(js, "JabberError")
+ log_error(extract_traceback())
continue
except SSLError, e:
self.print_message(js, "SSLError")
+ log_error(extract_traceback())
continue
else:
# Ran out of Jabber servers to try
commit 32d5d9a1471cfed0316371c491ed8648e8164ac2
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Fri Sep 25 07:25:09 2009 -0400
Diff SELinux contexts
diff --git a/client/tools/rhncfg/config_common/file_utils.py
b/client/tools/rhncfg/config_common/file_utils.py
index c34c605..3e19550 100644
--- a/client/tools/rhncfg/config_common/file_utils.py
+++ b/client/tools/rhncfg/config_common/file_utils.py
@@ -18,6 +18,12 @@ import time
import tempfile
import base64
from config_common.rhn_log import log_debug
+try:
+ from selinux import lgetfilecon
+except:
+ # on rhel4 we do not support selinux
+ def lgetfilecon(path):
+ return [0, '']
from config_common import utils
@@ -81,7 +87,13 @@ class FileProcessor:
temp_file, temp_dirs = self.process(file_struct)
path = file_struct['path']
- result = None
+ sectx_result = ''
+ result = ''
+
+ cur_sectx = lgetfilecon(path)[1]
+ if file_struct.has_key('selinux_ctx'):
+ if cur_sectx != file_struct['selinux_ctx']:
+ sectx_result = "SELinux contexts differ! Current context:
%s\n" % cur_sectx
if file_struct['filetype'] == 'symlink':
try:
@@ -101,7 +113,7 @@ class FileProcessor:
result = pipe.read()
os.unlink(temp_file)
- return result
+ return sectx_result + result
def _validate_struct(self, file_struct):
for k in self.file_struct_fields.keys():