[SCM] CTDB repository - branch master updated - ctdb-1.0.57-5-gc4bc431

[Ronnie Sahlberg]

The branch, master has been updated
       via  c4bc4317df4106e81b238dbfaf861ca6104304c1 (commit)
       via  4d1c0418cfe6170bc081684dbe45908a5d285f0b (commit)
      from  f84d0a9a8c7e9589e8833f21e1f977a0adab356b (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c4bc4317df4106e81b238dbfaf861ca6104304c1
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Aug 27 10:26:34 2008 +1000

    new version 1.0.58

commit 4d1c0418cfe6170bc081684dbe45908a5d285f0b
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Wed Aug 27 10:24:35 2008 +1000

    rename ctdb_tcp_client back to the original name ctdb_control_tcp

-----------------------------------------------------------------------

Summary of changes:
 include/ctdb_private.h  |    2 +-
 packaging/RPM/ctdb.spec |    6 +++++-
 server/ctdb_control.c   |    2 +-
 server/ctdb_takeover.c  |    2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 8834ec4..a25674c 100644
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -565,7 +565,7 @@ struct ctdb_control_set_call {
   struct for tcp_client control
   used by samba   can not modify
  */
-struct ctdb_tcp_client {
+struct ctdb_control_tcp {
 	struct sockaddr_in src; // samba uses this
 	struct sockaddr_in dest;// samba uses this
 };
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index e0abc7c..070f967 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 57
+Release: 58
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -118,6 +118,10 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Wed Aug 27 2008 : Version 1.0.58
+ - revert the name change tcp_tcp_client back to tcp_control_tcp so
+   samba can build.
+ - Updates to the init script from Abhijith Das <adas at redhat.com>
 * Mon Aug 25 2008 : Version 1.0.57
  - initial support for IPv6
 * Mon Aug 11 2008 : Version 1.0.56
diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index 68635d6..4128797 100644
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -296,7 +296,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
 		return ctdb_control_get_public_ips(ctdb, c, outdata);
 
 	case CTDB_CONTROL_TCP_CLIENT: 
-		CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_tcp_client));
+		CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_control_tcp));
 		return ctdb_control_tcp_client(ctdb, client_id, indata);
 
 	case CTDB_CONTROL_STARTUP: 
diff --git a/server/ctdb_takeover.c b/server/ctdb_takeover.c
index b33471d..fb20ff1 100644
--- a/server/ctdb_takeover.c
+++ b/server/ctdb_takeover.c
@@ -956,7 +956,7 @@ int32_t ctdb_control_tcp_client(struct ctdb_context *ctdb, uint32_t client_id,
 				TDB_DATA indata)
 {
 	struct ctdb_client *client = ctdb_reqid_find(ctdb, client_id, struct ctdb_client);
-	struct ctdb_tcp_client *p = (struct ctdb_tcp_client *)indata.dptr;
+	struct ctdb_control_tcp *p = (struct ctdb_control_tcp *)indata.dptr;
 	struct ctdb_tcp_list *tcp;
 	struct ctdb_control_tcp_vnn t;
 	int ret;


-- 
CTDB repository