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: include by andrew from (linux-ha-cvs@lists.linux-ha.org) 2. Linux-HA CVS: crm by andrew from (linux-ha-cvs@lists.linux-ha.org) 3. Linux-HA CVS: lib by alan from (linux-ha-cvs@lists.linux-ha.org) ---------------------------------------------------------------------- Message: 1 Date: Mon, 15 May 2006 04:21:06 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : include Dir : linux-ha/include/crm/common Modified Files: xml.h Log Message: Allow renames and or new ID's to be assigned silently in do_id_check() As yet no-where allows renames but everywhere except startup allows new ID's to be assigned where one doesnt exist. =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/include/crm/common/xml.h,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- xml.h 5 May 2006 12:54:33 -0000 1.45 +++ xml.h 15 May 2006 10:21:05 -0000 1.46 @@ -1,4 +1,4 @@ -/* $Id: xml.h,v 1.45 2006/05/05 12:54:33 andrew Exp $ */ +/* $Id: xml.h,v 1.46 2006/05/15 10:21:05 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> * @@ -54,7 +54,8 @@ #endif extern void hash2nvpair(gpointer key, gpointer value, gpointer user_data); extern void hash2field(gpointer key, gpointer value, gpointer user_data); -extern gboolean do_id_check(crm_data_t *xml_obj, GHashTable *id_hash); +extern gboolean do_id_check(crm_data_t *xml_obj, GHashTable *id_hash, + gboolean silent_add, gboolean silent_rename); /* * Replacement function for xmlCopyPropList which at the very least, ------------------------------ Message: 2 Date: Mon, 15 May 2006 04:33:23 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : andrew Host : Project : linux-ha Module : crm Dir : linux-ha/crm/admin Modified Files: cibadmin.c Log Message: Allow new ID's but no renames =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/cibadmin.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -3 -r1.52 -r1.53 --- cibadmin.c 8 May 2006 07:42:17 -0000 1.52 +++ cibadmin.c 15 May 2006 10:33:22 -0000 1.53 @@ -1,4 +1,4 @@ -/* $Id: cibadmin.c,v 1.52 2006/05/08 07:42:17 andrew Exp $ */ +/* $Id: cibadmin.c,v 1.53 2006/05/15 10:33:22 andrew Exp $ */ /* * Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]> @@ -385,7 +385,7 @@ } else if(cib_action != NULL) { crm_debug_4("Passing \"%s\" to variant_op...", cib_action); - if(input != NULL && do_id_check(input, NULL)) { + if(input != NULL && do_id_check(input, NULL, TRUE, FALSE)) { crm_err("ID Check failed."); return cib_id_check; } ------------------------------ Message: 3 Date: Mon, 15 May 2006 08:46:02 -0600 (MDT) From: linux-ha-cvs@lists.linux-ha.org Subject: [Linux-ha-cvs] Linux-HA CVS: lib by alan from To: [EMAIL PROTECTED] Message-ID: <[EMAIL PROTECTED]> linux-ha CVS committal Author : alan Host : Project : linux-ha Module : lib Dir : linux-ha/lib/plugins/lrm Modified Files: raexecstonith.c Log Message: Changed a format string to be a string literal - for GCC parameter checking reasons. This should not have compiled without warnings as it was before. And, we translate warnings to errors... =================================================================== RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecstonith.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- raexecstonith.c 15 May 2006 08:47:27 -0000 1.17 +++ raexecstonith.c 15 May 2006 14:46:01 -0000 1.18 @@ -87,27 +87,27 @@ get_resource_meta }; -static const char * const meta_template = -"<?xml version=\"1.0\"?>\n" -"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n" -"<resource-agent name=\"%s\"\n" -"<version>1.0</version>\n" -"<longdesc lang=\"en\">\n" -"%s\n" -"</longdesc>\n" -"<shortdesc lang=\"en\">%s</shortdesc>\n" -"%s\n" -"<actions>\n" -"<action name=\"start\" timeout=\"15\" />\n" -"<action name=\"stop\" timeout=\"15\" />\n" -"<action name=\"status\" timeout=\"15\" />\n" -"<action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\" />\n" -"<action name=\"meta-data\" timeout=\"15\" />\n" -"</actions>\n" -"<special tag=\"heartbeat\">\n" -"<version>2.0</version>\n" -"</special>\n" -"</resource-agent>\n"; +#define META_TEMPLATE \ +"<?xml version=\"1.0\"?>\n" \ +"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n" \ +"<resource-agent name=\"%s\"\n" \ +"<version>1.0</version>\n" \ +"<longdesc lang=\"en\">\n" \ +"%s\n" \ +"</longdesc>\n" \ +"<shortdesc lang=\"en\">%s</shortdesc>\n" \ +"%s\n" \ +"<actions>\n" \ +"<action name=\"start\" timeout=\"15\" />\n" \ +"<action name=\"stop\" timeout=\"15\" />\n" \ +"<action name=\"status\" timeout=\"15\" />\n" \ +"<action name=\"monitor\" timeout=\"15\" interval=\"15\" start-delay=\"15\" />\n" \ +"<action name=\"meta-data\" timeout=\"15\" />\n" \ +"</actions>\n" \ +"<special tag=\"heartbeat\">\n" \ +"<version>2.0</version>\n" \ +"</special>\n" \ +"</resource-agent>\n" static const char * no_parameter_info = "<!-- No parameter segment --->"; @@ -323,12 +323,12 @@ CHECKMETANULL(meta_param, "parameters") - bufferlen = strlen(meta_template) + strlen(rsc_type) + bufferlen = STRLEN_CONST(META_TEMPLATE) + strlen(rsc_type) + strlen(meta_longdesc) + strlen(meta_shortdesc) + strlen(meta_param) + 1; buffer = g_new(char, bufferlen); buffer[bufferlen-1] = '\0'; - snprintf(buffer, bufferlen-1, meta_template, rsc_type + snprintf(buffer, bufferlen-1, META_TEMPLATE, rsc_type , meta_longdesc, meta_shortdesc, meta_param); stonith_delete(stonith_obj); ------------------------------ _______________________________________________ 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 30, Issue 45 ********************************************