Send Linux-ha-cvs mailing list submissions to linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs or, via email, send a message with subject or body 'help' to [EMAIL PROTECTED] You can reach the person managing the list at [EMAIL PROTECTED] When replying, please edit your Subject line so it is more specific than "Re: Contents of Linux-ha-cvs digest..." Today's Topics: 1. Linux-HA CVS: lrm by lars from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: mgmt by zhenh from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Wed, 19 Jul 2006 15:44:18 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by lars from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : lars Host : Project : linux-ha Module : lrm Dir : linux-ha/lrm/lrmd Modified Files: lrmd.c Log Message: Coverity #48: rsc was dereferenced before NULL check. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v retrieving revision 1.232 retrieving revision 1.233 diff -u -3 -r1.232 -r1.233 --- lrmd.c 13 Jul 2006 02:21:42 -0000 1.232 +++ lrmd.c 19 Jul 2006 21:44:17 -0000 1.233 @@ -1,4 +1,4 @@ -/* $Id: lrmd.c,v 1.232 2006/07/13 02:21:42 sunjd Exp $ */ +/* $Id: lrmd.c,v 1.233 2006/07/19 21:44:17 lars Exp $ */ /* * Local Resource Manager Daemon * @@ -3047,14 +3047,16 @@ { lrmd_rsc_t* rsc = (lrmd_rsc_t*)data; + if (rsc == NULL) { + return FALSE; + } + if ((int)rsc->delay_timeout > 0) { Gmain_timeout_remove(rsc->delay_timeout); rsc->delay_timeout = (guint)-1; } - if (rsc != NULL) { - perform_op(rsc); - } + perform_op(rsc); return FALSE; } @@ -3884,6 +3886,9 @@ } /* * $Log: lrmd.c,v $ + * Revision 1.233 2006/07/19 21:44:17 lars + * Coverity #48: rsc was dereferenced before NULL check. + * * Revision 1.232 2006/07/13 02:21:42 sunjd * bug1346: resolve the hangup issue * ------------------------------ Message: 2 Date: Thu, 20 Jul 2006 01:49:12 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : zhenh Host : Project : linux-ha Module : mgmt Dir : linux-ha/mgmt/daemon Modified Files: mgmt_crm.c mgmtd.c Log Message: improve some logs =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -3 -r1.62 -r1.63 --- mgmt_crm.c 6 Jul 2006 09:30:27 -0000 1.62 +++ mgmt_crm.c 20 Jul 2006 07:49:11 -0000 1.63 @@ -148,7 +148,7 @@ return -1; } - mgmt_log(LOG_DEBUG, "(delete)xml:%s",xml); + mgmt_log(LOG_INFO, "(delete)xml:%s",xml); rc = cib_conn->cmds->delete( cib_conn, type, cib_object, output, cib_sync_call); @@ -507,7 +507,7 @@ on_cib_diff(const char *event, HA_Message *msg) { if (debug_level) { - mgmt_log(LOG_DEBUG,"update cib finished"); + mgmt_debug(LOG_DEBUG,"update cib finished"); } if (cib_cache_enable) { if (cib_cached != NULL) { @@ -775,7 +775,7 @@ fragment = create_cib_fragment(cib_object, "nodes"); - mgmt_log(LOG_DEBUG, "(update)xml:%s",xml); + mgmt_log(LOG_INFO, "(update)xml:%s",xml); rc = cib_conn->cmds->update( cib_conn, "nodes", fragment, &output, cib_sync_call); @@ -812,7 +812,7 @@ return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_DEBUG, "(delete resources)xml:%s",xml); + mgmt_log(LOG_INFO, "(delete resources)xml:%s",xml); rc = cib_conn->cmds->delete( cib_conn, "resources", cib_object, &output, cib_sync_call); @@ -1012,7 +1012,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_add_rsc:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); if (in_group || clone || master) { @@ -1117,7 +1117,7 @@ free_data_set(data_set); return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",dump_xml_formatted(parent->xml)); + mgmt_log(LOG_INFO, "on_move_rsc:%s",dump_xml_formatted(parent->xml)); free_data_set(data_set); rc = cib_conn->cmds->variant_op( @@ -1157,7 +1157,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_add_grp:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->create(cib_conn, "resources", fragment, &output, cib_sync_call); @@ -1461,7 +1461,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_rsc_attr:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update( @@ -1510,7 +1510,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_rsc_params:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update( @@ -1584,7 +1584,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_set_target_role:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update( @@ -1666,7 +1666,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_DEBUG, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_rsc_ops:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update( @@ -1748,7 +1748,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_clone:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update(cib_conn, "resources", fragment, &output, cib_sync_call); free_xml(fragment); @@ -1831,7 +1831,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_master:%s",xml); fragment = create_cib_fragment(cib_object, "resources"); rc = cib_conn->cmds->update(cib_conn, "resources", fragment, &output, cib_sync_call); free_xml(fragment); @@ -1991,7 +1991,7 @@ if(cib_object == NULL) { return cl_strdup(MSG_FAIL); } - mgmt_log(LOG_INFO, "xml:%s",xml); + mgmt_log(LOG_INFO, "on_update_constraint:%s",xml); fragment = create_cib_fragment(cib_object, "constraints"); rc = cib_conn->cmds->update( =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- mgmtd.c 5 Jul 2006 22:56:43 -0000 1.22 +++ mgmtd.c 20 Jul 2006 07:49:11 -0000 1.23 @@ -164,10 +164,14 @@ debug_level = 2; } } - + else { + debug_level = 0; + } + cl_log_set_entity(mgmtd_name); cl_log_enable_stderr(FALSE); cl_log_set_facility(LOG_DAEMON); + /* Use logd if it's enabled by heartbeat */ cl_inherit_use_logd(ENV_PREFIX""KEY_LOGDAEMON, 0); @@ -437,7 +441,7 @@ mgmt_log(LOG_ERR, "%s receive login msg failed", __FUNCTION__); return TRUE; } - mgmt_log(LOG_DEBUG, "recv msg: %s %s ****", args[0], args[1]); + mgmt_debug(LOG_DEBUG, "recv msg: %s %s ****", args[0], args[1]); /* authorization check with pam */ if (pam_auth(args[1],args[2]) != 0 || !usr_belong_grp(args[1],ALLOW_GRP)) { mgmt_del_args(args); @@ -450,7 +454,7 @@ } mgmt_del_args(args); mgmt_del_msg(msg); - mgmt_log(LOG_DEBUG, "send msg: %s", MSG_OK); + mgmt_debug(LOG_DEBUG, "send msg: %s", MSG_OK); mgmt_session_sendmsg(session, MSG_OK); new_client(csock, session); return TRUE; @@ -473,7 +477,7 @@ return TRUE; } msg = mgmt_session_recvmsg(client->session); - mgmt_log(LOG_DEBUG, "recv msg: %s", msg); + mgmt_debug(LOG_DEBUG, "recv msg: %s", msg); if (msg == NULL || STRNCMP_CONST(msg, MSG_LOGOUT) == 0) { mgmt_del_msg(msg); del_client(client->id); @@ -481,12 +485,12 @@ } ret = dispatch_msg(msg, client->id); if (ret != NULL) { - mgmt_log(LOG_DEBUG, "send msg: %s", ret); + mgmt_debug(LOG_DEBUG, "send msg: %s", ret); mgmt_session_sendmsg(client->session, ret); mgmt_del_msg(ret); } else { - mgmt_log(LOG_DEBUG, "send msg: %s", MSG_FAIL); + mgmt_debug(LOG_DEBUG, "send msg: %s", MSG_FAIL); mgmt_session_sendmsg(client->session, MSG_FAIL); } mgmt_del_msg(msg); @@ -625,9 +629,9 @@ continue; } - mgmt_log(LOG_DEBUG, "send evt: %s", event); + mgmt_debug(LOG_DEBUG, "send evt: %s", event); mgmt_session_sendmsg(client->session, event); - mgmt_log(LOG_DEBUG, "send evt: %s done", event); + mgmt_debug(LOG_DEBUG, "send evt: %s done", event); node = g_list_next(node); } ------------------------------ _______________________________________________ Linux-ha-cvs mailing list Linux-ha-cvs@lists.linux-ha.org http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs End of Linux-ha-cvs Digest, Vol 32, Issue 61 ********************************************