Can you amend your first patch with this change? Regards -steve
On 01/31/2011 08:16 PM, Angus Salkeld wrote: > From: Lon Hohberger <[email protected]> > > Signed-off-by: Lon Hohberger <[email protected]> > Signed-off-by: Angus Salkeld <[email protected]> > --- > tools/corosync-notifyd.c | 14 +++++++++----- > 1 files changed, 9 insertions(+), 5 deletions(-) > > diff --git a/tools/corosync-notifyd.c b/tools/corosync-notifyd.c > index d0565de..a78f6a3 100644 > --- a/tools/corosync-notifyd.c > +++ b/tools/corosync-notifyd.c > @@ -461,7 +461,7 @@ _cs_dbus_node_quorum_event(char *nodename, uint32_t > nodeid, const char *state) > > if (!(msg = dbus_message_new_signal(DBUS_CS_PATH, > DBUS_CS_IFACE, > - "QorumStateChange"))) { > + "QuorumStateChange"))) { > syslog (LOG_ERR, "%s(%d) error\n", __func__, __LINE__); > goto out_unlock; > } > @@ -905,12 +905,16 @@ _cs_check_config(void) > } > > #ifndef ENABLE_SNMP > - syslog(LOG_ERR, "Not compiled with Snmp support enabled, exiting."); > - exit(EXIT_FAILURE); > + if (conf[CS_NTF_SNMP]) { > + syslog(LOG_ERR, "Not compiled with SNMP support enabled, > exiting."); > + exit(EXIT_FAILURE); > + } > #endif > #ifndef HAVE_DBUS > - syslog(LOG_ERR, "Not compiled with Dbus support enabled, exiting."); > - exit(EXIT_FAILURE); > + if (conf[CS_NTF_DBUS]) { > + syslog(LOG_ERR, "Not compiled with DBus support enabled, > exiting."); > + exit(EXIT_FAILURE); > + } > #endif > > if (conf[CS_NTF_STDOUT] && !conf[CS_NTF_FG]) { _______________________________________________ Openais mailing list [email protected] https://lists.linux-foundation.org/mailman/listinfo/openais
