diff --git a/include/crm/msg_xml.h b/include/crm/msg_xml.h
index 6a967ad9d9..9b752b208e 100644
--- a/include/crm/msg_xml.h
+++ b/include/crm/msg_xml.h
@@ -1,144 +1,145 @@
-/* $Id: msg_xml.h,v 1.5 2004/06/09 14:27:11 andrew Exp $ */
+/* $Id: msg_xml.h,v 1.6 2004/06/25 16:24:47 andrew Exp $ */
 /* 
  * Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
  * 
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  * 
  * This software is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #ifndef XML_TAGS__H
 #define XML_TAGS__H
 
 #define CRM_VERSION			"0.1"
 
 //---- Common tags/attrs
 #define XML_TAG_CIB			"cib"
 #define XML_TAG_FAILED			"failed"
 
 #define XML_ATTR_GENERATION		"generation"
 #define XML_ATTR_TIMEOUT		"timeout"
 #define XML_ATTR_TSTAMP			"timestamp"
 #define XML_ATTR_VERSION		"version"
 #define XML_ATTR_DESC			"description"
 #define XML_ATTR_ID			"id"
 #define XML_ATTR_TYPE			"type"
 #define XML_ATTR_FILTER_TYPE		"type_filter"
 #define XML_ATTR_FILTER_ID		"id_filter"
 #define XML_ATTR_FILTER_PRIORITY	"priority_filter"
 #define XML_ATTR_VERBOSE		"verbose"
 #define XML_ATTR_OP			"op"
 #define XML_ATTR_TRUEOP			"true_op"
 
 #define XML_BOOLEAN_TRUE		"true"
 #define XML_BOOLEAN_FALSE		"false"
 #define XML_BOOLEAN_YES			XML_BOOLEAN_TRUE
 #define XML_BOOLEAN_NO			XML_BOOLEAN_FALSE
 
 #define XML_TAG_OPTIONS			"options"
 
 //---- top level tags/attrs
 #define XML_MSG_TAG			"crm_message"
 #define XML_ATTR_REQUEST		"request"
 #define XML_ATTR_RESPONSE		"response"
 
 #define XML_ATTR_MSGTYPE		"message_type"
 #define XML_ATTR_SYSFROM		"sys_from"
 #define XML_ATTR_SYSTO			"sys_to"
 #define XML_ATTR_SYSCC			"sys_cc"
 #define XML_ATTR_HOSTFROM		"host_from"
 #define XML_ATTR_HOSTTO			"host_to"
 #define XML_ATTR_REFERENCE		"crm_msg_reference"
 
 #define XML_FAIL_TAG_RESOURCE		"failed_resource"
 
 #define XML_FAILRES_ATTR_RESID		"resource_id"
 #define XML_FAILRES_ATTR_REASON		"reason"
 #define XML_FAILRES_ATTR_RESSTATUS	"resource_status"
 
 #define XML_CRM_TAG_PING		"ping_response"
 #define XML_PING_ATTR_STATUS		"ping_result"
 #define XML_PING_ATTR_SYSFROM		"crm_subsystem"
 
 #define XML_TAG_FRAGMENT		"cib_fragment"
 #define XML_ATTR_RESULT			"cib_action_result"
 #define XML_ATTR_SECTION		"section"
 
 #define XML_FAIL_TAG_CIB		"failed_update"
 
 #define XML_FAILCIB_ATTR_ID		"id"
 #define XML_FAILCIB_ATTR_OBJTYPE	"object_type"
 #define XML_FAILCIB_ATTR_OP		"operation"
 #define XML_FAILCIB_ATTR_REASON		"reason"
 
 //---- CIB specific tags/attrs
 #define XML_CIB_TAG_CONFIGURATION	"configuration"
 #define XML_CIB_TAG_STATUS       	"status"
 #define XML_CIB_TAG_RESOURCES		"resources"
 #define XML_CIB_TAG_NODES         	"nodes"
 #define XML_CIB_TAG_CONSTRAINTS   	"constraints"
+#define XML_CIB_TAG_CRMCONFIG   	"crm_config"
 
 #define XML_CIB_TAG_STATE         	"node_state"
 #define XML_CIB_TAG_RESOURCE      	"resource"
 #define XML_CIB_TAG_NODE          	"node"
 #define XML_CIB_TAG_CONSTRAINT    	"constraint"
 #define XML_CIB_TAG_NVPAIR        	"nv_pair"
 
 #define XML_CIB_TAG_LRM		  	"lrm"
 #define XML_LRM_TAG_RESOURCES     	"lrm_resources"
 
 #define XML_CIB_ATTR_HEALTH       	"health"
 #define XML_CIB_ATTR_WEIGHT       	"weight"
 #define XML_CIB_ATTR_PRIORITY     	"priority"
 #define XML_CIB_ATTR_RESTIMEOUT   	"res_timeout"
 #define XML_CIB_ATTR_MAXINSTANCE  	"max_instances"
 #define XML_CIB_ATTR_INSTANCE     	"instance"
 #define XML_CIB_ATTR_CLEAR        	"clear_on"
 #define XML_CIB_ATTR_SOURCE       	"source"
 
 #define XML_CIB_ATTR_JOINSTATE    	"join"
 #define XML_CIB_ATTR_EXPSTATE     	"expected"
 #define XML_CIB_ATTR_INCCM        	"in_ccm"
 #define XML_CIB_ATTR_CRMDSTATE    	"crmd"
 
 #define XML_CIB_ATTR_SHUTDOWN       	"shutdown"
 #define XML_CIB_ATTR_CLEAR_SHUTDOWN 	"clear_shutdown"
 #define XML_CIB_ATTR_STONITH	    	"stonith"
 #define XML_CIB_ATTR_CLEAR_STONITH  	"clear_stonith"
 
 #define XML_LRM_ATTR_TASK		"task"
 #define XML_LRM_ATTR_TARGET		"target"
 #define XML_LRM_ATTR_DISCARD		"discard"
 #define XML_LRM_ATTR_RUNNABLE		"runnable"
 #define XML_LRM_ATTR_OPTIONAL		"optional"
 
 #define XML_NODE_ATTR_STATE		"state"
 #define XML_LRM_ATTR_LASTOP		"last_op"
 #define XML_LRM_ATTR_OPSTATE		"op_state"
 #define XML_LRM_ATTR_OPCODE		"op_code"
 
 #define XML_NVPAIR_ATTR_NAME        	"name"
 #define XML_NVPAIR_ATTR_VALUE        	"value"
 
 #define XML_STRENGTH_VAL_MUST		"must"
 #define XML_STRENGTH_VAL_SHOULD		"should"
 #define XML_STRENGTH_VAL_SHOULDNOT	"should_not"
 #define XML_STRENGTH_VAL_MUSTNOT	"must_not"
 
 #include <libxml/tree.h> 
 
 #define ID(x) xmlGetProp(x, XML_ATTR_ID)
 #define INSTANCE(x) xmlGetProp(x, XML_CIB_ATTR_INSTANCE)
 #define TSTAMP(x) xmlGetProp(x, XML_ATTR_TSTAMP)
 #define TYPE(x) x != NULL ? x->name : NULL 
 
 #endif