Send Linux-ha-cvs mailing list submissions to
[email protected]
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: lib by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: lib by lars from ([email protected])
4. Linux-HA CVS: lib by lars from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 12:30:49 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_attrs.c
Log Message:
Make sure the set name is unique across the whole CIB not just the section
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- cib_attrs.c 9 Apr 2006 13:15:43 -0000 1.19
+++ cib_attrs.c 9 Apr 2006 18:30:48 -0000 1.20
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.19 2006/04/09 13:15:43 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.20 2006/04/09 18:30:48 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -43,6 +43,7 @@
gboolean is_crm_config = FALSE; \
gboolean is_node_transient = FALSE; \
char *local_attr_id = NULL; \
+ char *local_set_name = NULL; \
if(attr_id == NULL && attr_name == NULL) { \
return cib_missing; \
\
@@ -66,14 +67,16 @@
return cib_missing; \
} \
if(set_name == NULL) { \
- set_name = node_uuid; \
+ local_set_name = crm_concat(section, node_uuid, '-'); \
+ set_name = local_set_name; \
} \
\
} else if(safe_str_eq(section, XML_CIB_TAG_STATUS)) { \
is_node_transient = TRUE; \
tag = XML_TAG_TRANSIENT_NODEATTRS; \
if(set_name == NULL) { \
- set_name = node_uuid; \
+ local_set_name = crm_concat(section, node_uuid, '-'); \
+ set_name = local_set_name; \
} \
\
} else { \
@@ -166,6 +169,7 @@
cib_error2string(rc));
}
+ crm_free(local_set_name);
crm_free(local_attr_id);
free_xml(fragment);
@@ -304,6 +308,7 @@
xml_next, XML_NVPAIR_ATTR_VALUE);
}
+ crm_free(local_set_name);
crm_free(local_attr_id);
free_xml(fragment);
@@ -346,6 +351,7 @@
the_cib, section, xml_obj, NULL,
cib_sync_call|cib_quorum_override);
+ crm_free(local_set_name);
crm_free(local_attr_id);
free_xml(xml_obj);
return rc;
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 14:03:32 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/cib
Modified Files:
cib_attrs.c
Log Message:
Get rid of the fragment creation piece
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/cib/cib_attrs.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- cib_attrs.c 9 Apr 2006 18:30:48 -0000 1.20
+++ cib_attrs.c 9 Apr 2006 20:03:32 -0000 1.21
@@ -1,4 +1,4 @@
-/* $Id: cib_attrs.c,v 1.20 2006/04/09 18:30:48 andrew Exp $ */
+/* $Id: cib_attrs.c,v 1.21 2006/04/09 20:03:32 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -102,7 +102,6 @@
enum cib_errors rc = cib_ok;
crm_data_t *xml_top = NULL;
crm_data_t *xml_obj = NULL;
- crm_data_t *fragment = NULL;
attr_common_setup(section);
@@ -150,13 +149,9 @@
crm_xml_add(xml_obj, XML_NVPAIR_ATTR_VALUE, attr_value);
crm_log_xml_debug_2(xml_top, "Update");
- fragment = create_cib_fragment(xml_top, section);
- crm_log_xml_debug_3(fragment, "Update Fragment");
-
- free_xml(xml_top);
- rc = the_cib->cmds->update(
- the_cib, section, fragment, NULL,
call_options|cib_quorum_override);
+ rc = the_cib->cmds->update(the_cib, section, xml_top, NULL,
+ call_options|cib_quorum_override);
if(rc == cib_diff_resync) {
/* this is an internal matter - the update succeeded */
@@ -171,7 +166,7 @@
crm_free(local_set_name);
crm_free(local_attr_id);
- free_xml(fragment);
+ free_xml(xml_top);
return rc;
}
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 16:20:15 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
ipctransientclient.c
Log Message:
CID 9: If we ever hit that error, we'd have dereferenced ch == NULL in the
call to G_main_add_IPC_Channel()
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipctransientclient.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ipctransientclient.c 5 Dec 2004 19:13:01 -0000 1.15
+++ ipctransientclient.c 9 Apr 2006 22:20:15 -0000 1.16
@@ -1,4 +1,4 @@
-/* $Id: ipctransientclient.c,v 1.15 2004/12/05 19:13:01 andrew Exp $ */
+/* $Id: ipctransientclient.c,v 1.16 2006/04/09 22:20:15 lars Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -134,6 +134,7 @@
if (ch == NULL) {
cl_log(LOG_ERR, "[Client] Could not access channel on: %s",
commpath);
+ return NULL;
} else if(ch->ops->initiate_connection(ch) != IPC_OK) {
cl_log(LOG_ERR, "[Client] Could not init comms on: %s",
commpath);
return NULL;
------------------------------
Message: 4
Date: Sun, 9 Apr 2006 16:23:28 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
ipctest.c
Log Message:
CID 8: If the channel == NULL, we shouldn't dereference it.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/ipctest.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- ipctest.c 24 Jan 2006 11:31:49 -0000 1.46
+++ ipctest.c 9 Apr 2006 22:23:28 -0000 1.47
@@ -1,4 +1,4 @@
-/* $Id: ipctest.c,v 1.46 2006/01/24 11:31:49 davidlee Exp $ */
+/* $Id: ipctest.c,v 1.47 2006/04/09 22:23:28 lars Exp $ */
/*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -265,11 +265,13 @@
channel = ipc_channel_constructor(IPC_ANYTYPE,
wattrs);
if (channel == NULL) {
cl_perror("client: channel creation
failed");
+ exit(1);
}
rc = channel->ops->initiate_connection(channel);
if (rc != IPC_OK) {
cl_perror("channel[1] failed to
connect");
+ exit(1);
}
checksock(channel);
rc = clientfunc(channel, count);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 50
********************************************
