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: heartbeat by blaschke from
([email protected])
2. Linux-HA CVS: heartbeat by gshi from
([email protected])
3. Linux-HA CVS: heartbeat by blaschke from
([email protected])
4. Linux-HA CVS: lib by gshi from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Nov 2005 12:29:07 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
Tag: STABLE_1_2
cl_status.c
Log Message:
Bug 958 - Not sure if this is the answer to fix previous HEAD merge, but
at least BSC passes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/Attic/cl_status.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -3 -r1.1.2.18 -r1.1.2.19
--- cl_status.c 3 Nov 2005 07:47:30 -0000 1.1.2.18
+++ cl_status.c 14 Nov 2005 19:29:07 -0000 1.1.2.19
@@ -271,7 +271,7 @@
}
/* cl_log(LOG_DEBUG, "Signing in with heartbeat.");*/
- if (hb->llc_ops->signon(hb, NULL)!= HA_OK) {
+ if (hb->llc_ops->signon(hb, cl_status_name)!= HA_OK) {
ret_value = 1;
HB_SIGNON = FALSE;
if (cmds[i].needsignon) {
------------------------------
Message: 2
Date: Mon, 14 Nov 2005 13:55:30 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
Tag: STABLE_1_2
config.c hb_api.c
Log Message:
make heartbeat accept a casual client from a user whose group id is haclient
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.113.2.11
retrieving revision 1.113.2.12
diff -u -3 -r1.113.2.11 -r1.113.2.12
--- config.c 11 Aug 2005 21:08:23 -0000 1.113.2.11
+++ config.c 14 Nov 2005 20:55:29 -0000 1.113.2.12
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.113.2.11 2005/08/11 21:08:23 gshi Exp $ */
+/* $Id: config.c,v 1.113.2.12 2005/11/14 20:55:29 gshi Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -445,6 +445,7 @@
, {"ccm", "uid=" HA_CCMUSER}
, {"ping", "gid=" HA_APIGROUP}
, {"cl_status", "gid=" HA_APIGROUP}
+ , {"anon", "gid=" HA_APIGROUP}
};
if ((f = fopen(cfgfile, "r")) == NULL) {
@@ -2025,6 +2026,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.113.2.12 2005/11/14 20:55:29 gshi
+ * make heartbeat accept a casual client from a user whose group id is haclient
+ *
* Revision 1.113.2.11 2005/08/11 21:08:23 gshi
* Move str_to_boolean function to clplumbing/cl_misc.c
* We use that function in ipfail.c to determine the value of auto_failback
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/hb_api.c,v
retrieving revision 1.94.2.5
retrieving revision 1.94.2.6
diff -u -3 -r1.94.2.5 -r1.94.2.6
--- hb_api.c 3 Jan 2005 20:56:08 -0000 1.94.2.5
+++ hb_api.c 14 Nov 2005 20:55:29 -0000 1.94.2.6
@@ -1,4 +1,4 @@
-/* $Id: hb_api.c,v 1.94.2.5 2005/01/03 20:56:08 gshi Exp $ */
+/* $Id: hb_api.c,v 1.94.2.6 2005/11/14 20:55:29 gshi Exp $ */
/*
* hb_api: Server-side heartbeat API code
*
@@ -1313,9 +1313,15 @@
* then default to the "default" authorization category.
* otherwise, use the client type's authorization list
*/
- if (client->iscasual
- || (gauth = g_hash_table_lookup(APIAuthorization
- , client->client_id)) == NULL) {
+ if (client->iscasual){
+ gauth = g_hash_table_lookup(APIAuthorization, "anon");
+ if (gauth == NULL){
+ cl_log(LOG_ERR, "NO auth found for anonymous");
+ return FALSE;
+ }
+
+ }else if((gauth = g_hash_table_lookup(APIAuthorization,
+ client->client_id)) == NULL) {
if ((gauth = g_hash_table_lookup(APIAuthorization, "default"))
== NULL) {
client->removereason = "no default client auth";
------------------------------
Message: 3
Date: Mon, 14 Nov 2005 14:01:16 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by blaschke from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : blaschke
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
Tag: STABLE_1_2
cl_status.c
Log Message:
Bug 958 - gshi brought over missing changes from config.c and hb_api.c
so go back to multiple client login capability
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/Attic/cl_status.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -3 -r1.1.2.19 -r1.1.2.20
--- cl_status.c 14 Nov 2005 19:29:07 -0000 1.1.2.19
+++ cl_status.c 14 Nov 2005 21:01:15 -0000 1.1.2.20
@@ -271,7 +271,7 @@
}
/* cl_log(LOG_DEBUG, "Signing in with heartbeat.");*/
- if (hb->llc_ops->signon(hb, cl_status_name)!= HA_OK) {
+ if (hb->llc_ops->signon(hb, NULL)!= HA_OK) {
ret_value = 1;
HB_SIGNON = FALSE;
if (cmds[i].needsignon) {
------------------------------
Message: 4
Date: Mon, 14 Nov 2005 14:05:51 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by gshi from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : gshi
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/clplumbing
Modified Files:
cl_msg_types.c
Log Message:
not sure if this is the right way to make BEAM stop complaining but I will give
it a shot
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/clplumbing/cl_msg_types.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- cl_msg_types.c 11 Nov 2005 20:46:15 -0000 1.32
+++ cl_msg_types.c 14 Nov 2005 21:05:50 -0000 1.33
@@ -1636,7 +1636,7 @@
/* BEAM think this is a memory leak, but actually it is handle nicely
* in cl_msg_replace: old value is freed and new value is saved
*/
- return cl_msg_replace(msg, index, (char*)msgfield, 0, FT_UNCOMPRESS);/*
memory leak */
+ return cl_msg_replace(msg, index, (char*)msgfield, 0, FT_UNCOMPRESS);/*
resource leak */
}
struct fieldtypefuncs_s fieldtypefuncs[NUM_MSG_TYPES]=
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 24, Issue 51
********************************************
