[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  9c48345 s3-proto: move remaining krb5 protos to krb5_protos.h
       via  f08250e s3-ctdb Fix duplicate function name due to packet -> ctdb_packet rename.
      from  cd9a7c1 s3: reply_readbraw_error needs an sconn as argument also in the non-LFS code path

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


- Log -----------------------------------------------------------------
commit 9c48345e32c9aebd93c67103ea6984d74f2061b4
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 3 12:05:47 2011 +0200

    s3-proto: move remaining krb5 protos to krb5_protos.h
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue May  3 15:38:40 CEST 2011 on sn-devel-104

commit f08250eb55930bd8613c7ebe1a0de2fb0ccbff30
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue May 3 19:11:38 2011 +1000

    s3-ctdb Fix duplicate function name due to packet -> ctdb_packet rename.
    
    Signed-off-by: Günther Deschner <gd at samba.org>

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

Summary of changes:
 source3/include/ctdb_packet.h |    2 +-
 source3/include/krb5_protos.h |    6 ++++++
 source3/include/proto.h       |    7 -------
 source3/lib/ctdb_packet.c     |    2 +-
 source3/lib/ctdbd_conn.c      |    2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/ctdb_packet.h b/source3/include/ctdb_packet.h
index 267a988..026b23f 100644
--- 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/include/krb5_protos.h b/source3/include/krb5_protos.h
index d80e77d..c535888 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -131,3 +131,9 @@ int cli_krb5_get_ticket(TALLOC_CTX *mem_ctx,
 			time_t *tgs_expire,
 			const char *impersonate_princ_s);
 
+/* The following definitions come from libsmb/clikrb5.c  */
+
+bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx,
+			   DATA_BLOB *edata,
+			   DATA_BLOB *edata_out);
+bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e8ce418..bb2c64b 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1620,13 +1620,6 @@ NTSTATUS cli_force_encryption(struct cli_state *c,
 			const char *password,
 			const char *domain);
 
-/* The following definitions come from libsmb/clikrb5.c  */
-
-bool unwrap_edata_ntstatus(TALLOC_CTX *mem_ctx, 
-			   DATA_BLOB *edata, 
-			   DATA_BLOB *edata_out);
-bool unwrap_pac(TALLOC_CTX *mem_ctx, DATA_BLOB *auth_data, DATA_BLOB *unwrapped_pac_data);
-
 /* The following definitions come from libsmb/clilist.c  */
 
 NTSTATUS cli_list_old(struct cli_state *cli,const char *Mask,uint16 attribute,
diff --git a/source3/lib/ctdb_packet.c b/source3/lib/ctdb_packet.c
index 772fcec..03be372 100644
--- 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 0b053ec..9c353ba 100644
--- 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);
 }
 
 /*


-- 
Samba Shared Repository