[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  1b7cd33 s3-vfs: try to fix the Tru64 build.
       via  bb65187 s3-proto: move more rpc client prototypes to cli_pipe.h.
      from  2b608f3 script: add hardcoded library release key id

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


- Log -----------------------------------------------------------------
commit 1b7cd33291ec69f58a68396cf7406a6da3083df3
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 21 18:26:40 2011 +0200

    s3-vfs: try to fix the Tru64 build.
    
    Volker, Jeremy please check.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Thu Apr 21 19:14:00 CEST 2011 on sn-devel-104

commit bb65187b8978c418bff9cca0881b31b5ad9bb93e
Author: Günther Deschner <gd at samba.org>
Date:   Thu Apr 21 18:24:35 2011 +0200

    s3-proto: move more rpc client prototypes to cli_pipe.h.
    
    Guenther

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

Summary of changes:
 source3/include/proto.h       |    7 -------
 source3/include/vfs.h         |    6 ++++++
 source3/rpc_client/cli_pipe.h |    9 +++++++++
 3 files changed, 15 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/proto.h b/source3/include/proto.h
index d4ab13d..36f0235 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2672,13 +2672,6 @@ NTSTATUS rpc_pipe_open_interface(TALLOC_CTX *mem_ctx,
 				 struct messaging_context *msg_ctx,
 				 struct rpc_pipe_client **cli_pipe);
 
-/* The following definitions come from rpc_client/cli_pipe_schannel.c  */
-
-NTSTATUS get_schannel_session_key(struct cli_state *cli,
-				  const char *domain,
-				  uint32 *pneg_flags,
-				  struct rpc_pipe_client **presult);
-
 /* The following definitions come from rpc_server/rpc_handles.c  */
 
 size_t num_pipe_handles(struct pipes_struct *p);
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 28d6c38..b96ab92 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -32,6 +32,12 @@
 #undef vfs_ops
 #endif
 
+/* Avoid conflict with an Tru64 include file:
+   the vfsops struct on Tru64 has a vfs_init function pointer which we
+   overwrite with a macro below */
+
+#undef vfsops
+
 /*
  * As we're now (thanks Andrew ! :-) using file_structs and connection
  * structs in the vfs - then anyone writing a vfs must include includes.h...
diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h
index 81c382f..65cc975 100644
--- a/source3/rpc_client/cli_pipe.h
+++ b/source3/rpc_client/cli_pipe.h
@@ -25,6 +25,8 @@
 
 #include "rpc_client/rpc_client.h"
 
+/* The following definitions come from rpc_client/cli_pipe.c  */
+
 struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
 					 struct event_context *ev,
 					 struct rpc_pipe_client *cli,
@@ -148,6 +150,13 @@ NTSTATUS cli_get_session_key(TALLOC_CTX *mem_ctx,
 			     struct rpc_pipe_client *cli,
 			     DATA_BLOB *session_key);
 
+/* The following definitions come from rpc_client/cli_pipe_schannel.c  */
+
+NTSTATUS get_schannel_session_key(struct cli_state *cli,
+				  const char *domain,
+				  uint32 *pneg_flags,
+				  struct rpc_pipe_client **presult);
+
 #endif /* _CLI_PIPE_H */
 
 /* vim: set ts=8 sw=8 noet cindent ft=c.doxygen: */


-- 
Samba Shared Repository