CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [EMAIL PROTECTED] 2008-07-29 07:23:01
Modified files:
. : clustermon.spec.in.in
ricci/ricci : DBusController.cpp
ricci/ricci/d-bus: ricci.oddjob.conf
Log message:
fix missing plumbing for ricci-modvirt
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/clustermon.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.18.2.40&r2=1.18.2.41
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15.2.1&r2=1.15.2.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.oddjob.conf.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1&r2=1.1.2.1
--- conga/clustermon.spec.in.in 2008/07/28 18:09:43 1.18.2.40
+++ conga/clustermon.spec.in.in 2008/07/29 07:23:00 1.18.2.41
@@ -195,6 +195,7 @@
%changelog
* Thu Apr 10 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.1-1
- Fix bz441947 (cluster-snmp dlopen failure)
+- Fix bz453600 (cluster-snmp deadlocks snmpd)
* Thu Mar 27 2008 Ryan McCabe <[EMAIL PROTECTED]> 0.12.0-7
- Fix bz439186
--- conga/ricci/ricci/DBusController.cpp 2008/01/17 17:38:39 1.15.2.1
+++ conga/ricci/ricci/DBusController.cpp 2008/07/29 07:23:01 1.15.2.2
@@ -41,12 +41,12 @@
DBusController::DBusController()
{
// TODO: dynamically determine,
- // currently, rpm requires storage and cluster modules
_mod_map["storage"] = "modstorage_rw";
_mod_map["cluster"] = "modcluster_rw";
_mod_map["rpm"] = "modrpm_rw";
_mod_map["log"] = "modlog_rw";
_mod_map["service"] = "modservice_rw";
+ _mod_map["virt"] = "modvirt_rw";
_mod_map["reboot"] = "reboot";
MutexLocker lock(_dbus_mutex);
--- conga/ricci/ricci/d-bus/ricci.oddjob.conf 2006/06/15 03:08:37 1.1
+++ conga/ricci/ricci/d-bus/ricci.oddjob.conf 2008/07/29 07:23:01 1.1.2.1
@@ -18,6 +18,9 @@
<method name="modservice_rw">
<allow user="ricci"/>
</method>
+ <method name="modvirt_rw">
+ <allow user="ricci"/>
+ </method>
<method name="reboot">
<helper exec="/sbin/reboot"
arguments="0"
