s3-ctdb Fix duplicate function name due to packet -> ctdb_packet rename.

Signed-off-by: Günther Deschner <gd@samba.org>

diff --git a/source3/include/ctdb_packet.h b/source3/include/ctdb_packet.h
index 267a98825f50e73a7428d5c5937d879c10a9c0c3..026b23f90e428c6f1d7f74fc030ef68a9002d87f 100644 (file)
--- a/source3/include/ctdb_packet.h
+++ b/source3/include/ctdb_packet.h
@@ -38,7 +38,7 @@ NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx);
 /*
  * Sync read, wait for the next chunk
  */
-NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx, int timeout);
+NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout);
 
 /*
  * Handle an incoming ctdb_packet:

diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c
index 772fcec4219ceff6bad256fbc7df3a036551b9cc..03be372f193d5b220780578fcfb81036af05c2be 100644 (file)
--- a/source3/lib/ctdb_packet.c
+++ b/source3/lib/ctdb_packet.c
@@ -105,7 +105,7 @@ NTSTATUS ctdb_packet_fd_read(struct ctdb_packet_context *ctx)
        return NT_STATUS_OK;
 }
 
-NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx, int timeout)
+NTSTATUS ctdb_packet_fd_read_sync_timeout(struct ctdb_packet_context *ctx, int timeout)
 {
        int res, revents;
 

diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index 0b053ecb70a777584d3f1e00a1303ecfd40af716..9c353baba455d728c56ea25ddfbfe0f452560963 100644 (file)
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -336,7 +336,7 @@ static NTSTATUS ctdb_packet_fd_read_sync(struct ctdb_packet_context *ctx)
        if (timeout == 0) {
                timeout = -1;
        }
-       return ctdb_packet_fd_read_sync(ctx, timeout);
+       return ctdb_packet_fd_read_sync_timeout(ctx, timeout);
 }
 
 /*