Rev 593: merge from volker in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 593
revision-id: tridge at samba.org-20070822071855-94o4boiec7hci2bt
parent: tridge at samba.org-20070822071601-gkr2z4fx47k3begz
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Wed 2007-08-22 17:18:55 +1000
message:
  merge from volker
modified:
  common/system_linux.c          system.c-20070525071636-a5n1ihghjtppy08r-3
  doc/ctdb.1.xml                 ctdb.1.xml-20070608070258-bjuf7701h1qc1b05-2
  doc/ctdbd.1.xml                ctdbd.1.xml-20070610004256-jh1qq0ws5zidbmbq-1
=== modified file 'common/system_linux.c'
--- a/common/system_linux.c	2007-08-15 02:34:41 +0000
+++ b/common/system_linux.c	2007-08-22 07:18:55 +0000
@@ -161,8 +161,10 @@
 {
 	uint32_t sum = uint16_checksum(data, n);
 	uint16_t sum2;
-	sum += uint16_checksum((uint16_t *)&ip->saddr, sizeof(ip->saddr));
-	sum += uint16_checksum((uint16_t *)&ip->daddr, sizeof(ip->daddr));
+	sum += uint16_checksum((uint16_t *)(void *)&ip->saddr,
+			       sizeof(ip->saddr));
+	sum += uint16_checksum((uint16_t *)(void *)&ip->daddr,
+			       sizeof(ip->daddr));
 	sum += ip->protocol + n;
 	sum = (sum & 0xFFFF) + (sum >> 16);
 	sum = (sum & 0xFFFF) + (sum >> 16);

=== modified file 'doc/ctdb.1.xml'
--- a/doc/ctdb.1.xml	2007-08-02 21:53:52 +0000
+++ b/doc/ctdb.1.xml	2007-08-22 07:18:55 +0000
@@ -59,7 +59,7 @@
       <varlistentry><term>-Y</term>
         <listitem>
           <para>
-            Produce output in machinereadable form for easier parsing by scripts. Not all commands support this option.
+            Produce output in machine readable form for easier parsing by scripts. Not all commands support this option.
           </para>
         </listitem>
       </varlistentry>
@@ -132,7 +132,7 @@
           OK - This node is fully functional.
         </para>
         <para>
-          DISCONNECTED - This node could not be connected through the network and is currently not parcipitating in the cluster. If there is a public IP address associated with this node it should have been taken over by a different node. No services are running on this node.
+          DISCONNECTED - This node could not be connected through the network and is currently not participating in the cluster. If there is a public IP address associated with this node it should have been taken over by a different node. No services are running on this node.
         </para>
         <para>
           DISABLED - This node has been administratively disabled. This node is still functional and participates in the CTDB cluster but its IP addresses have been taken over by a different node and no services are currently being hosted.
@@ -156,7 +156,7 @@
       <refsect3><title>VNNMAP</title>
         <para>
           The list of Virtual Node Numbers. This is a list of all nodes that actively participates in the cluster and that share the workload of hosting the Clustered TDB database records.
-          Only nodes that are parcipitating in the vnnmap can become lmaster or dmaster for a database record.
+          Only nodes that are participating in the vnnmap can become lmaster or dmaster for a database record.
         </para>
       </refsect3>
 

=== modified file 'doc/ctdbd.1.xml'
--- a/doc/ctdbd.1.xml	2007-07-10 05:46:05 +0000
+++ b/doc/ctdbd.1.xml	2007-08-22 07:18:55 +0000
@@ -319,7 +319,7 @@
     
     <para>
       DISCONNECTED - This node could not be connected through the network 
-      and is currently not parcipitating in the cluster. If there is a 
+      and is currently not particpating in the cluster. If there is a 
       public IP address associated with this node it should have been taken 
       over by a different node. No services are running on this node.
     </para>