[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Mon May 16 08:57:27 MDT 2011


The branch, v3-6-test has been updated
       via  7a4cc69 s3-rpc_server: (re)move last globally included rpc_server prototypes.
       via  ce063fd s3: include ntdomain.h before including generated srv_ headers.
       via  9a6a1a5 s3-rpc_server: add pipes_struct forward declaration.
       via  44c6ed7 s3-printing: avoid using pipes_struct when only session_info is needed.
       via  54559a5 s3-proto: move remaining srvsvc protos to own header file.
       via  8143106 s3-proto: move remaining spoolss protos to own header file.
       via  e3c65e2 s3-proto: move more rpc_server prototypes out of proto.h
       via  6c07214 s3-proto: move rpc_srv_register protos and structs to town headerfile.
       via  2cc2f7f s3-proto: move more headers to rpc_server/rpc_ncacn_np.h where they origin from.
       via  0b0dc24 s3-proto: remove duplicate prototypes.
       via  944dceb s3-rpc_server: remove some unneeded headers.
       via  dfdc021 s3-proto: move rpc_server/rpc_handles.c protos to ntdomain.h
       via  f92793f s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
       via  7daafe4 s3-proto: move more rpc client prototypes to cli_pipe.h.
      from  fce32d9 s4-smbtorture: add test_netremotetod.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 7a4cc69ac8d2b6f53735a2f2cea8d40b7e965235
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:27:45 2011 +0200

    s3-rpc_server: (re)move last globally included rpc_server prototypes.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon May  2 16:05:31 CEST 2011 on sn-devel-104
    (cherry picked from commit 56cd3b3bbbb595cb0c98fa2dfa397c915fbf37d2)

commit ce063fde45bfe649f8f50dd72e42db10b3d94f30
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:21:53 2011 +0200

    s3: include ntdomain.h before including generated srv_ headers.
    
    Guenther
    (cherry picked from commit 0e76eddcc8a4e7e98167b8f92387fae015fae095)

commit 9a6a1a5b934247c3d8c81934788231e331c2b020
Author: Günther Deschner <gd at samba.org>
Date:   Mon May 2 13:19:51 2011 +0200

    s3-rpc_server: add pipes_struct forward declaration.
    
    Guenther
    (cherry picked from commit 911cdc56c146014058063b872372ff8096c06065)

commit 44c6ed73b6f27484014cde771715c94475cac53f
Author: Günther Deschner <gd at samba.org>
Date:   Sat Apr 30 00:09:09 2011 +0200

    s3-printing: avoid using pipes_struct when only session_info is needed.
    
    Guenther
    (cherry picked from commit cd5b2b242b39437081592d41d297bce0668b40ab)

commit 54559a55bd90f18330759b88fc9b2457951ccfdb
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:57:49 2011 +0200

    s3-proto: move remaining srvsvc protos to own header file.
    
    Guenther
    (cherry picked from commit daa02f34b181a3ec7224e920f787cc677bc3cdf2)

commit 8143106d7290aa4ae713bc04603b8b589bc86346
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:47:25 2011 +0200

    s3-proto: move remaining spoolss protos to own header file.
    
    Guenther
    (cherry picked from commit c233c21425a183dd1124329fdbca13ab92cc6d6a)

commit e3c65e2b7da2f7fbee4e6211bbe4f01c0873edec
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 23:32:28 2011 +0200

    s3-proto: move more rpc_server prototypes out of proto.h
    
    Guenther
    (cherry picked from commit 047d8c073b57bc12648a251deaceedb65f4f59cf)

commit 6c07214f6a851f5fef573c8e7ffd9c1959e3702b
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 22:32:12 2011 +0200

    s3-proto: move rpc_srv_register protos and structs to town headerfile.
    
    Guenther
    (cherry picked from commit 49d5f62b42d821bb8a11b595efb53eb88ec3c570)

commit 2cc2f7fe76e501c95206f91f4170d7e3829d89a0
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:40:24 2011 +0200

    s3-proto: move more headers to rpc_server/rpc_ncacn_np.h where they origin from.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Apr 29 22:05:07 CEST 2011 on sn-devel-104
    (cherry picked from commit bbacaec4e9365b128eb11467c95412de7473c1ec)

commit 0b0dc24c82a6dd383cbffebae366fbf8e60ed66e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:20:27 2011 +0200

    s3-proto: remove duplicate prototypes.
    
    Guenther
    (cherry picked from commit bc781bf7d98baca57c8043bf7dc0a95f8ffd1345)

commit 944dceb45b384c68a581b3f27a914c9e1d9d10cf
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 16:19:54 2011 +0200

    s3-rpc_server: remove some unneeded headers.
    
    Guenther
    (cherry picked from commit 487cb0c96ef8ca05fcef35d0d7c49bc067f6cff7)

commit dfdc021e75fa4168b01ab77bfa1cb8c2539393db
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 15:22:29 2011 +0200

    s3-proto: move rpc_server/rpc_handles.c protos to ntdomain.h
    
    Guenther

commit f92793f3f728c05f47671dc2697bf3ea3ace705d
Author: Günther Deschner <gd at samba.org>
Date:   Fri Apr 29 15:13:55 2011 +0200

    s3-proto: move more librpc prototypes to librpc/rpc/dcerpc.h
    
    Guenther
    (cherry picked from commit faf11751255202274505d72848c54ee6e5dce7b6)

commit 7daafe4d9e3620d8de2796a08924ff780528ac4f
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/nt_printing.h                      |    6 +-
 source3/include/ntdomain.h                         |   29 +++++
 source3/include/proto.h                            |  112 --------------------
 source3/librpc/rpc/dcerpc.h                        |    8 ++
 source3/librpc/rpc/rpc_common.c                    |    1 +
 source3/printing/nt_printing.c                     |   24 ++--
 source3/printing/spoolssd.c                        |    3 +
 source3/rpc_client/cli_pipe.h                      |    9 ++
 source3/rpc_client/cli_winreg_int.h                |    1 +
 source3/rpc_server/dfs/srv_dfs_nt.c                |    2 +-
 source3/rpc_server/dssetup/srv_dssetup_nt.c        |    2 +-
 source3/rpc_server/echo/srv_echo_nt.c              |    2 +-
 source3/rpc_server/epmapper/srv_epmapper.c         |    2 +-
 source3/rpc_server/epmd.c                          |    2 +
 source3/rpc_server/eventlog/srv_eventlog_nt.c      |    2 +-
 .../rpc_server/initshutdown/srv_initshutdown_nt.c  |    2 +-
 source3/rpc_server/lsa/srv_lsa_nt.c                |    2 +-
 source3/rpc_server/netlogon/srv_netlog_nt.c        |    2 +-
 source3/rpc_server/ntsvcs/srv_ntsvcs_nt.c          |    2 +-
 source3/rpc_server/rpc_ep_setup.c                  |    4 +
 source3/rpc_server/rpc_ep_setup.h                  |    2 +
 source3/rpc_server/rpc_handles.c                   |    1 +
 source3/rpc_server/rpc_ncacn_np.h                  |    7 ++
 source3/rpc_server/rpc_server.c                    |    5 +-
 source3/rpc_server/rpc_server.h                    |    2 +
 source3/rpc_server/samr/srv_samr_nt.c              |    2 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.c        |    7 +-
 source3/rpc_server/spoolss/srv_spoolss_nt.h        |   40 +++++++
 source3/rpc_server/srv_pipe.c                      |    1 +
 .../srv_pipe.h}                                    |   19 +++-
 source3/rpc_server/srv_pipe_hnd.c                  |    8 +-
 source3/rpc_server/srv_pipe_hnd.h                  |   51 +++++++++
 source3/rpc_server/srv_pipe_register.c             |    1 +
 .../{srv_pipe_internal.h => srv_pipe_register.h}   |   33 +++---
 source3/rpc_server/srvsvc/srv_srvsvc_nt.c          |    1 +
 source3/rpc_server/svcctl/srv_svcctl_nt.c          |    3 +-
 .../svcctl/srv_svcctl_nt.h}                        |   17 ++-
 source3/rpc_server/winreg/srv_winreg_nt.c          |    2 +-
 source3/rpc_server/wkssvc/srv_wkssvc_nt.c          |    2 +-
 source3/smbd/conn.c                                |    1 +
 source3/smbd/ipc.c                                 |    1 +
 source3/smbd/pipes.c                               |    1 +
 source3/smbd/process.c                             |    1 +
 source3/smbd/server_exit.c                         |    2 +-
 source3/smbd/smb2_ioctl.c                          |    1 +
 source3/smbd/smb2_read.c                           |    1 +
 source3/smbd/smb2_write.c                          |    1 +
 source3/smbd/trans2.c                              |    1 +
 source3/winbindd/winbindd.c                        |    1 +
 source3/winbindd/winbindd_dual_ndr.c               |    2 +-
 source3/winbindd/winbindd_dual_srv.c               |    2 +-
 51 files changed, 255 insertions(+), 181 deletions(-)
 create mode 100644 source3/rpc_server/spoolss/srv_spoolss_nt.h
 copy source3/{printing/nt_printing_migrate.h => rpc_server/srv_pipe.h} (57%)
 create mode 100644 source3/rpc_server/srv_pipe_hnd.h
 copy source3/rpc_server/{srv_pipe_internal.h => srv_pipe_register.h} (53%)
 copy source3/{printing/nt_printing_migrate.h => rpc_server/svcctl/srv_svcctl_nt.h} (59%)


Changeset truncated at 500 lines:

diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h
index 02a72b3..ad6262e 100644
--- a/source3/include/nt_printing.h
+++ b/source3/include/nt_printing.h
@@ -23,7 +23,7 @@
 #define NT_PRINTING_H_
 
 #include "client.h"
-#include "../librpc/gen_ndr/srv_spoolss.h"
+#include "../librpc/gen_ndr/spoolss.h"
 
 #ifndef SAMBA_PRINTER_PORT_NAME
 #define SAMBA_PRINTER_PORT_NAME "Samba Printer Port"
@@ -169,11 +169,11 @@ bool printer_driver_files_in_use(TALLOC_CTX *mem_ctx,
 bool delete_driver_files(const struct auth_serversupplied_info *server_info,
 			 const struct spoolss_DriverInfo8 *r);
 
-WERROR move_driver_to_download_area(struct pipes_struct *p,
+WERROR move_driver_to_download_area(struct auth_serversupplied_info *session_info,
 				    struct spoolss_AddDriverInfoCtr *r);
 
 WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx,
-			      struct pipes_struct *rpc_pipe,
+			      struct auth_serversupplied_info *session_info,
 			      struct spoolss_AddDriverInfoCtr *r);
 
 void map_printer_permissions(struct security_descriptor *sd);
diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index a18c0a4..ed97182 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -193,4 +193,33 @@ struct api_struct {
 	bool (*fn) (struct pipes_struct *);
 };
 
+/* The following definitions come from rpc_server/rpc_handles.c  */
+
+size_t num_pipe_handles(struct pipes_struct *p);
+bool init_pipe_handles(struct pipes_struct *p, const struct ndr_syntax_id *syntax);
+bool create_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd, void *data_ptr);
+bool find_policy_by_hnd(struct pipes_struct *p, const struct policy_handle *hnd,
+			void **data_p);
+bool close_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd);
+void close_policy_by_pipe(struct pipes_struct *p);
+bool pipe_access_check(struct pipes_struct *p);
+
+void *_policy_handle_create(struct pipes_struct *p, struct policy_handle *hnd,
+			    uint32_t access_granted, size_t data_size,
+			    const char *type, NTSTATUS *pstatus);
+#define policy_handle_create(_p, _hnd, _access, _type, _pstatus) \
+	(_type *)_policy_handle_create((_p), (_hnd), (_access), sizeof(_type), #_type, \
+				       (_pstatus))
+
+void *_policy_handle_find(struct pipes_struct *p,
+			  const struct policy_handle *hnd,
+			  uint32_t access_required, uint32_t *paccess_granted,
+			  const char *name, const char *location,
+			  NTSTATUS *pstatus);
+#define policy_handle_find(_p, _hnd, _access_required, _access_granted, _type, _pstatus) \
+	(_type *)_policy_handle_find((_p), (_hnd), (_access_required), \
+				     (_access_granted), #_type, __location__, (_pstatus))
+
+#include "rpc_server/srv_pipe_register.h"
+
 #endif /* _NT_DOMAIN_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 213ce12..c88ff57 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2653,118 +2653,6 @@ void set_server_role(void);
 uint32 get_int_param( const char* param );
 char* get_string_param( const char* param );
 
-/* The following definitions come from librpc/rpc/rpc_common.c  */
-struct ndr_interface_table;
-bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
-const struct ndr_interface_table *get_iface_from_syntax(
-	const struct ndr_syntax_id *syntax);
-const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
-                                     const struct ndr_syntax_id *syntax);
-
-/* 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  */
-
-struct pipes_struct;
-size_t num_pipe_handles(struct pipes_struct *p);
-bool init_pipe_handles(struct pipes_struct *p, const struct ndr_syntax_id *syntax);
-bool create_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd, void *data_ptr);
-bool find_policy_by_hnd(struct pipes_struct *p, const struct policy_handle *hnd,
-			void **data_p);
-bool close_policy_hnd(struct pipes_struct *p, struct policy_handle *hnd);
-void close_policy_by_pipe(struct pipes_struct *p);
-bool pipe_access_check(struct pipes_struct *p);
-
-void *_policy_handle_create(struct pipes_struct *p, struct policy_handle *hnd,
-			    uint32_t access_granted, size_t data_size,
-			    const char *type, NTSTATUS *pstatus);
-#define policy_handle_create(_p, _hnd, _access, _type, _pstatus) \
-	(_type *)_policy_handle_create((_p), (_hnd), (_access), sizeof(_type), #_type, \
-				       (_pstatus))
-
-void *_policy_handle_find(struct pipes_struct *p,
-			  const struct policy_handle *hnd,
-			  uint32_t access_required, uint32_t *paccess_granted,
-			  const char *name, const char *location,
-			  NTSTATUS *pstatus);
-#define policy_handle_find(_p, _hnd, _access_required, _access_granted, _type, _pstatus) \
-	(_type *)_policy_handle_find((_p), (_hnd), (_access_required), \
-				     (_access_granted), #_type, __location__, (_pstatus))
-
-
-/* The following definitions come from rpc_server/srv_rpc_register.c  */
-
-struct rpc_srv_callbacks {
-	bool (*init)(void *private_data);
-	bool (*shutdown)(void *private_data);
-	void *private_data;
-};
-
-struct api_struct;
-NTSTATUS rpc_srv_register(int version, const char *clnt,
-			  const char *srv,
-			  const struct ndr_interface_table *iface,
-			  const struct api_struct *cmds, int size,
-			  const struct rpc_srv_callbacks *rpc_srv_cb);
-
-NTSTATUS rpc_srv_unregister(const struct ndr_interface_table *iface);
-
-/* The following definitions come from rpc_server/srv_pipe.c  */
-struct ncacn_packet;
-bool create_next_pdu(struct pipes_struct *p);
-bool api_pipe_bind_auth3(struct pipes_struct *p, struct ncacn_packet *pkt);
-bool setup_fault_pdu(struct pipes_struct *p, NTSTATUS status);
-bool is_known_pipename(const char *cli_filename, struct ndr_syntax_id *syntax);
-
-/* The following definitions come from rpc_server/srv_pipe_hnd.c  */
-
-struct pipes_struct *get_first_internal_pipe(void);
-struct pipes_struct *get_next_internal_pipe(struct pipes_struct *p);
-bool check_open_pipes(void);
-int close_internal_rpc_pipe_hnd(struct pipes_struct *p);
-
-bool fsp_is_np(struct files_struct *fsp);
-struct tsocket_address;
-NTSTATUS np_open(TALLOC_CTX *mem_ctx, const char *name,
-		 const struct tsocket_address *local_address,
-		 const struct tsocket_address *remote_address,
-		 struct client_address *client_id,
-		 struct auth_serversupplied_info *session_info,
-		 struct messaging_context *msg_ctx,
-		 struct fake_file_handle **phandle);
-bool np_read_in_progress(struct fake_file_handle *handle);
-struct tevent_req *np_write_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
-				 struct fake_file_handle *handle,
-				 const uint8_t *data, size_t len);
-NTSTATUS np_write_recv(struct tevent_req *req, ssize_t *pnwritten);
-struct tevent_req *np_read_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
-				struct fake_file_handle *handle,
-				uint8_t *data, size_t len);
-NTSTATUS np_read_recv(struct tevent_req *req, ssize_t *nread,
-		      bool *is_data_outstanding);
-
-ssize_t process_incoming_data(struct pipes_struct *p, char *data, size_t n);
-
-/* The following definitions come from rpc_server/srv_spoolss_nt.c  */
-void srv_spoolss_cleanup(void);
-
-void do_drv_upgrade_printer(struct messaging_context *msg,
-			    void *private_data,
-			    uint32_t msg_type,
-			    struct server_id server_id,
-			    DATA_BLOB *data);
-void update_monitored_printq_cache(struct messaging_context *msg_ctx);
-
-/* The following definitions come from rpc_server/srv_svcctl_nt.c  */
-
-bool init_service_op_table( void );
-bool shutdown_service_op_table(void);
-
 /* The following definitions come from lib/server_contexts.c  */
 struct tevent_context *server_event_context(void);
 void server_event_context_free(void);
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 30c6d1b..d7e8e0c 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -88,4 +88,12 @@ NTSTATUS dcerpc_check_auth(struct pipe_auth_data *auth,
 			   DATA_BLOB *raw_pkt,
 			   size_t *pad_len);
 
+/* The following definitions come from librpc/rpc/rpc_common.c  */
+
+bool smb_register_ndr_interface(const struct ndr_interface_table *interface);
+const struct ndr_interface_table *get_iface_from_syntax(
+	const struct ndr_syntax_id *syntax);
+const char *get_pipe_name_from_syntax(TALLOC_CTX *mem_ctx,
+                                     const struct ndr_syntax_id *syntax);
+
 #endif /* __S3_DCERPC_H__ */
diff --git a/source3/librpc/rpc/rpc_common.c b/source3/librpc/rpc/rpc_common.c
index b4c7e1d..65e3205 100644
--- a/source3/librpc/rpc/rpc_common.c
+++ b/source3/librpc/rpc/rpc_common.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "../librpc/gen_ndr/ndr_dssetup.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c
index a7539f6..552e1ba 100644
--- a/source3/printing/nt_printing.c
+++ b/source3/printing/nt_printing.c
@@ -36,7 +36,7 @@
 #include "smbd/smbd.h"
 #include "auth.h"
 #include "messages.h"
-#include "ntdomain.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
 
 /* Map generic permissions to printer object specific permissions */
 
@@ -578,7 +578,7 @@ static int file_version_is_newer(connection_struct *conn, fstring new_file, fstr
 /****************************************************************************
 Determine the correct cVersion associated with an architecture and driver
 ****************************************************************************/
-static uint32 get_correct_cversion(struct pipes_struct *p,
+static uint32 get_correct_cversion(struct auth_serversupplied_info *session_info,
 				   const char *architecture,
 				   const char *driverpath_in,
 				   WERROR *perr)
@@ -621,7 +621,7 @@ static uint32 get_correct_cversion(struct pipes_struct *p,
 
 	nt_status = create_conn_struct(talloc_tos(), &conn, printdollar_snum,
 				       lp_pathname(printdollar_snum),
-				       p->session_info, &oldcwd);
+				       session_info, &oldcwd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("get_correct_cversion: create_conn_struct "
 			 "returned %s\n", nt_errstr(nt_status)));
@@ -636,7 +636,7 @@ static uint32 get_correct_cversion(struct pipes_struct *p,
 		goto error_free_conn;
 	}
 
-	if (!become_user_by_session(conn, p->session_info)) {
+	if (!become_user_by_session(conn, session_info)) {
 		DEBUG(0, ("failed to become user\n"));
 		*perr = WERR_ACCESS_DENIED;
 		goto error_free_conn;
@@ -766,7 +766,7 @@ static uint32 get_correct_cversion(struct pipes_struct *p,
 } while (0);
 
 static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
-					   struct pipes_struct *rpc_pipe,
+					   struct auth_serversupplied_info *session_info,
 					   const char *architecture,
 					   const char **driver_path,
 					   const char **data_file,
@@ -826,7 +826,7 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
 	 *	NT2K: cversion=3
 	 */
 
-	*version = get_correct_cversion(rpc_pipe, short_architecture,
+	*version = get_correct_cversion(session_info, short_architecture,
 					*driver_path, &err);
 	if (*version == -1) {
 		return err;
@@ -839,12 +839,12 @@ static WERROR clean_up_driver_struct_level(TALLOC_CTX *mem_ctx,
 ****************************************************************************/
 
 WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx,
-			      struct pipes_struct *rpc_pipe,
+			      struct auth_serversupplied_info *session_info,
 			      struct spoolss_AddDriverInfoCtr *r)
 {
 	switch (r->level) {
 	case 3:
-		return clean_up_driver_struct_level(mem_ctx, rpc_pipe,
+		return clean_up_driver_struct_level(mem_ctx, session_info,
 						    r->info.info3->architecture,
 						    &r->info.info3->driver_path,
 						    &r->info.info3->data_file,
@@ -853,7 +853,7 @@ WERROR clean_up_driver_struct(TALLOC_CTX *mem_ctx,
 						    r->info.info3->dependent_files,
 						    &r->info.info3->version);
 	case 6:
-		return clean_up_driver_struct_level(mem_ctx, rpc_pipe,
+		return clean_up_driver_struct_level(mem_ctx, session_info,
 						    r->info.info6->architecture,
 						    &r->info.info6->driver_path,
 						    &r->info.info6->data_file,
@@ -958,7 +958,7 @@ static WERROR move_driver_file_to_download_area(TALLOC_CTX *mem_ctx,
 	return ret;
 }
 
-WERROR move_driver_to_download_area(struct pipes_struct *p,
+WERROR move_driver_to_download_area(struct auth_serversupplied_info *session_info,
 				    struct spoolss_AddDriverInfoCtr *r)
 {
 	struct spoolss_AddDriverInfo3 *driver;
@@ -1004,7 +1004,7 @@ WERROR move_driver_to_download_area(struct pipes_struct *p,
 
 	nt_status = create_conn_struct(talloc_tos(), &conn, printdollar_snum,
 				       lp_pathname(printdollar_snum),
-				       p->session_info, &oldcwd);
+				       session_info, &oldcwd);
 	if (!NT_STATUS_IS_OK(nt_status)) {
 		DEBUG(0,("move_driver_to_download_area: create_conn_struct "
 			 "returned %s\n", nt_errstr(nt_status)));
@@ -1019,7 +1019,7 @@ WERROR move_driver_to_download_area(struct pipes_struct *p,
 		goto err_free_conn;
 	}
 
-	if (!become_user_by_session(conn, p->session_info)) {
+	if (!become_user_by_session(conn, session_info)) {
 		DEBUG(0, ("failed to become user\n"));
 		err = WERR_ACCESS_DENIED;
 		goto err_free_conn;
diff --git a/source3/printing/spoolssd.c b/source3/printing/spoolssd.c
index 340bf0a..a6d8a0f 100644
--- a/source3/printing/spoolssd.c
+++ b/source3/printing/spoolssd.c
@@ -24,10 +24,13 @@
 #include "messages.h"
 #include "include/printing.h"
 #include "printing/nt_printing_migrate.h"
+#include "ntdomain.h"
 #include "librpc/gen_ndr/srv_winreg.h"
 #include "librpc/gen_ndr/srv_spoolss.h"
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/rpc_ep_setup.h"
+#include "rpc_server/srv_pipe_register.h"
+#include "rpc_server/spoolss/srv_spoolss_nt.h"
 
 #define SPOOLSS_PIPE_NAME "spoolss"
 #define DAEMON_NAME "spoolssd"
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: */
diff --git a/source3/rpc_client/cli_winreg_int.h b/source3/rpc_client/cli_winreg_int.h
index 9eac462..a135ed9 100644
--- a/source3/rpc_client/cli_winreg_int.h
+++ b/source3/rpc_client/cli_winreg_int.h
@@ -24,6 +24,7 @@
 
 struct dcerpc_binding_handle;
 struct auth_serversupplied_info;
+struct dcerpc_binding_handle;
 
 /**
  * @brief Connect to the interal winreg server and open the given key.
diff --git a/source3/rpc_server/dfs/srv_dfs_nt.c b/source3/rpc_server/dfs/srv_dfs_nt.c
index 45e9d9a..324af53 100644
--- a/source3/rpc_server/dfs/srv_dfs_nt.c
+++ b/source3/rpc_server/dfs/srv_dfs_nt.c
@@ -22,11 +22,11 @@
 /* This is the implementation of the dfs pipe. */
 
 #include "includes.h"
+#include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_dfs.h"
 #include "msdfs.h"
 #include "smbd/smbd.h"
 #include "auth.h"
-#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_MSDFS
diff --git a/source3/rpc_server/dssetup/srv_dssetup_nt.c b/source3/rpc_server/dssetup/srv_dssetup_nt.c
index 73617df..d90ad42 100644
--- a/source3/rpc_server/dssetup/srv_dssetup_nt.c
+++ b/source3/rpc_server/dssetup/srv_dssetup_nt.c
@@ -23,9 +23,9 @@
  */
 
 #include "includes.h"
+#include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_dssetup.h"
 #include "secrets.h"
-#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/echo/srv_echo_nt.c b/source3/rpc_server/echo/srv_echo_nt.c
index 7f27984..c7a9e1a 100644
--- a/source3/rpc_server/echo/srv_echo_nt.c
+++ b/source3/rpc_server/echo/srv_echo_nt.c
@@ -22,8 +22,8 @@
 /* This is the interface to the rpcecho pipe. */
 
 #include "includes.h"
-#include "../librpc/gen_ndr/srv_echo.h"
 #include "ntdomain.h"
+#include "../librpc/gen_ndr/srv_echo.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/epmapper/srv_epmapper.c b/source3/rpc_server/epmapper/srv_epmapper.c
index e74cd3f..a44dfde 100644
--- a/source3/rpc_server/epmapper/srv_epmapper.c
+++ b/source3/rpc_server/epmapper/srv_epmapper.c
@@ -20,12 +20,12 @@
 */
 
 #include "includes.h"
+#include "ntdomain.h"
 #include "../libcli/security/security.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/srv_epmapper.h"
 #include "srv_epmapper.h"
 #include "auth.h"
-#include "ntdomain.h"
 
 typedef uint32_t error_status_t;
 
diff --git a/source3/rpc_server/epmd.c b/source3/rpc_server/epmd.c
index 5e82b27..04fdfb1 100644
--- a/source3/rpc_server/epmd.c
+++ b/source3/rpc_server/epmd.c
@@ -22,9 +22,11 @@
 #include "includes.h"
 
 #include "serverid.h"
+#include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_epmapper.h"
 #include "rpc_server/rpc_server.h"
 #include "rpc_server/epmapper/srv_epmapper.h"
+#include "rpc_server/srv_pipe_register.h"
 #include "messages.h"
 
 #define DAEMON_NAME "epmd"
diff --git a/source3/rpc_server/eventlog/srv_eventlog_nt.c b/source3/rpc_server/eventlog/srv_eventlog_nt.c
index 2e1c1fa..c0d9499 100644
--- a/source3/rpc_server/eventlog/srv_eventlog_nt.c
+++ b/source3/rpc_server/eventlog/srv_eventlog_nt.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_eventlog.h"
 #include "lib/eventlog/eventlog.h"
 #include "registry.h"
@@ -30,7 +31,6 @@
 #include "rpc_client/cli_winreg.h"
 #include "smbd/smbd.h"
 #include "auth.h"
-#include "ntdomain.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/initshutdown/srv_initshutdown_nt.c b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
index 8644d95..9b16d80 100644
--- a/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
+++ b/source3/rpc_server/initshutdown/srv_initshutdown_nt.c
@@ -21,9 +21,9 @@
 /* Implementation of registry functions. */
 
 #include "includes.h"
+#include "ntdomain.h"
 #include "../librpc/gen_ndr/srv_initshutdown.h"
 #include "../librpc/gen_ndr/srv_winreg.h"
-#include "ntdomain.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/lsa/srv_lsa_nt.c b/source3/rpc_server/lsa/srv_lsa_nt.c
index 69cf52b..f8c77ba 100644


-- 
Samba Shared Repository


More information about the samba-cvs mailing list