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: crm by andrew from
([email protected])
2. Linux-HA CVS: include by alan from
([email protected])
3. Linux-HA CVS: lib by alan from ([email protected])
4. Linux-HA CVS: mgmt by alan from ([email protected])
5. Linux-HA CVS: lib by alan from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 21 Dec 2005 00:26:40 -0700 (MST)
From: [email protected]
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/cib
Modified Files:
io.c
Log Message:
Unparseable config files shouldnt be overwritten.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/io.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- io.c 8 Nov 2005 06:27:38 -0000 1.35
+++ io.c 21 Dec 2005 07:26:39 -0000 1.36
@@ -1,4 +1,4 @@
-/* $Id: io.c,v 1.35 2005/11/08 06:27:38 gshi Exp $ */
+/* $Id: io.c,v 1.36 2005/12/21 07:26:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -123,6 +123,14 @@
root = file2xml(cib_file);
crm_xml_add(root, "generated", XML_BOOLEAN_FALSE);
fclose(cib_file);
+
+ if(root == NULL) {
+ crm_crit("Parse ERROR reading %s.", filename);
+ crm_crit("Inhibiting respawn by Heartbeat to avoid loss"
+ " of configuration data.");
+ sleep(3);
+ exit(100);
+ }
} else {
crm_warn("Stat of (%s) failed, file does not exist.",
------------------------------
Message: 2
Date: Wed, 21 Dec 2005 00:31:59 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/mgmt
Modified Files:
Makefile.am
Log Message:
Added missing headers to the mgmt makefile.am
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/mgmt/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 21 Sep 2005 05:13:25 -0000 1.1
+++ Makefile.am 21 Dec 2005 07:31:58 -0000 1.2
@@ -20,4 +20,8 @@
includedir=$(base_includedir)/heartbeat
-include_HEADERS = mgmt.h
+include_HEADERS = \
+ mgmt_client.h \
+ mgmt_common.h \
+ mgmt.h \
+ mgmt_tls.h
------------------------------
Message: 3
Date: Wed, 21 Dec 2005 00:53:38 -0700 (MST)
From: [email protected]
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/mgmt
Modified Files:
mgmt_tls_lib.c
Log Message:
Fixed a couple of TLS warnings.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_tls_lib.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_tls_lib.c 14 Dec 2005 09:39:24 -0000 1.2
+++ mgmt_tls_lib.c 21 Dec 2005 07:53:38 -0000 1.3
@@ -60,7 +60,7 @@
gnutls_set_default_priority(*session);
gnutls_kx_set_priority (*session, kx_prio);
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
- gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) sock);
+ gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t) (long)sock);
ret = gnutls_handshake(*session);
if (ret < 0) {
fprintf(stderr, "*** Handshake failed\n");
@@ -134,7 +134,7 @@
gnutls_kx_set_priority (*session, kx_prio);
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
gnutls_dh_set_prime_bits(*session, DH_BITS);
- gnutls_transport_set_ptr(*session, (gnutls_transport_ptr) sock);
+ gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t) (long)sock);
ret = gnutls_handshake(*session);
if (ret < 0) {
fprintf(stderr, "*** Handshake has failed (%s)\n\n",
------------------------------
Message: 4
Date: Wed, 21 Dec 2005 01:11:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmtd.c
Log Message:
Fixed various casting problems...
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- mgmtd.c 15 Dec 2005 08:04:41 -0000 1.10
+++ mgmtd.c 21 Dec 2005 08:11:15 -0000 1.11
@@ -383,7 +383,7 @@
char* msg;
void* session;
int ssock, csock;
- size_t laddr;
+ unsigned laddr;
struct sockaddr_in addr;
int num = 0;
char** args = NULL;
@@ -441,7 +441,7 @@
char* ret;
if (condition & G_IO_IN) {
- client = lookup_client((int)data);
+ client = lookup_client(GPOINTER_TO_INT(data));
if (client == NULL) {
return TRUE;
}
@@ -480,7 +480,7 @@
client->id = id;
client->ch = g_io_channel_unix_new(sock);
g_io_add_watch(client->ch, G_IO_IN|G_IO_ERR|G_IO_HUP
- , on_msg_arrived, (gpointer)client->id);
+ , on_msg_arrived, GINT_TO_POINTER(client->id));
client->session = session;
g_hash_table_insert(clients, (gpointer)&client->id, client);
id++;
@@ -587,13 +587,13 @@
while (node != NULL) {
client_t* client;
- int id = (int)node->data;
+ int id = GPOINTER_TO_INT(node->data);
client = lookup_client(id);
if (client == NULL) {
/* remove the client id */
node = g_list_next(node);
- id_list = g_list_remove(id_list, (gpointer)id);
+ id_list = g_list_remove(id_list, GINT_TO_POINTER(id));
list_changed = 1;
continue;
}
@@ -622,7 +622,7 @@
}
if (strncmp(args[0], MSG_REGEVT, strlen(MSG_REGEVT)) == 0) {
GList* id_list = g_hash_table_lookup(evt_map, args[1]);
- id_list = g_list_append(id_list, (gpointer)client_id);
+ id_list = g_list_append(id_list, GINT_TO_POINTER(client_id));
g_hash_table_replace(evt_map, cl_strdup(args[1]),
(gpointer)id_list);
reg_event(args[1], on_event);
ret = cl_strdup(MSG_OK);
------------------------------
Message: 5
Date: Wed, 21 Dec 2005 01:18:02 -0700 (MST)
From: [email protected]
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/mgmt
Modified Files:
mgmt_tls_lib.c
Log Message:
Thought of a better way to do the int->pointer casts I needed to do.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/mgmt/mgmt_tls_lib.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- mgmt_tls_lib.c 21 Dec 2005 07:53:38 -0000 1.3
+++ mgmt_tls_lib.c 21 Dec 2005 08:18:01 -0000 1.4
@@ -30,6 +30,7 @@
#include <unistd.h>
#include <gnutls/gnutls.h>
#include <mgmt/mgmt_tls.h>
+#include <glib.h>
#define DH_BITS 1024
@@ -60,7 +61,7 @@
gnutls_set_default_priority(*session);
gnutls_kx_set_priority (*session, kx_prio);
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_client);
- gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t) (long)sock);
+ gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t)
GINT_TO_POINTER(sock));
ret = gnutls_handshake(*session);
if (ret < 0) {
fprintf(stderr, "*** Handshake failed\n");
@@ -134,7 +135,7 @@
gnutls_kx_set_priority (*session, kx_prio);
gnutls_credentials_set(*session, GNUTLS_CRD_ANON, anoncred_server);
gnutls_dh_set_prime_bits(*session, DH_BITS);
- gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t) (long)sock);
+ gnutls_transport_set_ptr(*session, (gnutls_transport_ptr_t)
GINT_TO_POINTER(sock));
ret = gnutls_handshake(*session);
if (ret < 0) {
fprintf(stderr, "*** Handshake has failed (%s)\n\n",
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 52
********************************************
