s3-rpc_client: add and use rpc_client/rpc_client.h.

Guenther

diff --git a/source3/include/client.h b/source3/include/client.h
index a4c52c3a060ff146f3a0a674f720e45350962ff2..671640b8b4655850f09a5e27257986c45369a19a 100644 (file)
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -48,31 +48,6 @@ struct print_job_info {
        time_t t;
 };
 
-#include "rpc_client/rpc_transport.h"
-
-struct dcerpc_binding_handle;
-
-struct rpc_pipe_client {
-       struct rpc_pipe_client *prev, *next;
-
-       struct rpc_cli_transport *transport;
-       struct dcerpc_binding_handle *binding_handle;
-
-       struct ndr_syntax_id abstract_syntax;
-       struct ndr_syntax_id transfer_syntax;
-
-       char *desthost;
-       char *srv_name_slash;
-
-       uint16 max_xmit_frag;
-       uint16 max_recv_frag;
-
-       struct pipe_auth_data *auth;
-
-       /* The following is only non-null on a netlogon client pipe. */
-       struct netlogon_creds_CredentialState *dc;
-};
-
 struct cli_state_seqnum {
        struct cli_state_seqnum *prev, *next;
        uint16_t mid;

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index 8fb1248919fcd8e35aec38a6b020b5303cf54432..077924d6f489127d70fe58047d5188b62a57122e 100644 (file)
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -23,6 +23,8 @@
 #ifndef _NT_DOMAIN_H /* _NT_DOMAIN_H */
 #define _NT_DOMAIN_H 
 
+#include "librpc/rpc/dcerpc.h"
+
 /*
  * A bunch of stuff that was put into smb.h
  * in the NTDOM branch - it didn't belong there.

diff --git a/source3/lib/netapi/group.c b/source3/lib/netapi/group.c
index 5507f71d3037978ad429efe6d05947bcfb90b63c..4295d9f7bbf7ba52f8b9b9f3fd2df2c021601eef 100644 (file)
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/init_lsa.h"
 #include "../libcli/security/security.h"

diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index ce9df27181cd93ab316a0e30b9ac16bf283f3aff..51f4e1d74597fa9cd23e75200d35ea75d3f0b392 100644 (file)
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -23,6 +23,7 @@
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"

diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index 647ae653268e213d44d45d6658e8da6d6ce9063e..544698004a06200e648bfb1d9eaa1c8a41d06353 100644 (file)
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "lib/netapi/netapi.h"
 #include "lib/netapi/netapi_private.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_samr.h"
 #include "rpc_client/init_lsa.h"

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index 251dfb0a81548394f3b09be39a75d18251c6cd2d..235ef7f954718d41ea64bc679e4438e12521a550 100644 (file)
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "ads.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
 #include "registry.h"

diff --git a/source3/libnet/libnet_samsync.c b/source3/libnet/libnet_samsync.c
index 6d371f4afd29a677bb45dbfbb84a9a928afeff3a..1141bed730b4b6f7f7cb354254e4aec1cc8a8c73 100644 (file)
--- a/source3/libnet/libnet_samsync.c
+++ b/source3/libnet/libnet_samsync.c
@@ -26,6 +26,7 @@
 #include "../lib/crypto/crypto.h"
 #include "../libcli/samsync/samsync.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../libcli/security/security.h"

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 155a6b974171b595ea880682a97a9439fff18582..af2c56ad403fecbe4e18e20746352a7626be6879 100644 (file)
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -26,6 +26,7 @@
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/rpc_client.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../libcli/security/security.h"
 

diff --git a/source3/printing/nt_printing_migrate.c b/source3/printing/nt_printing_migrate.c
index c62d1c8de5fcef7ab2dea86df52e7b8d8a7d7374..55e49c973b407deed8381ee4a3c7b7db9beb2e89 100644 (file)
--- a/source3/printing/nt_printing_migrate.c
+++ b/source3/printing/nt_printing_migrate.c
@@ -22,6 +22,7 @@
 #include "system/filesys.h"
 #include "printing/nt_printing_migrate.h"
 
+#include "rpc_client/rpc_client.h"
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"

diff --git a/source3/printing/printspoolss.c b/source3/printing/printspoolss.c
index 352fcb8b6bc338766131e1c2dc241f9cacd721e3..2f6f19c3da776d34627909f405c7104ec3776fda 100644 (file)
--- a/source3/printing/printspoolss.c
+++ b/source3/printing/printspoolss.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "printing.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_server/rpc_ncacn_np.h"
 #include "smbd/smbd.h"

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index be499238c36252f8936b6d9eea12213c634cdfb7..e59957118197d86a8ee5027663a509ab64412c6e 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"

diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index 8dc232f412679cf113befcb94a1914167f784e06..bd3232d2cde4955652ba62b702302f1ddea1c3f7 100644 (file)
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client/rpc_client.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "rpc_client/cli_netlogon.h"

diff --git a/source3/rpc_client/cli_pipe.h b/source3/rpc_client/cli_pipe.h
index 30c1bad797a40f75a5d8e790b500497f951c5234..81c382f5a8fd0f9d34fb00466e9ebec7209582ac 100644 (file)
--- a/source3/rpc_client/cli_pipe.h
+++ b/source3/rpc_client/cli_pipe.h
@@ -23,6 +23,8 @@
 #ifndef _CLI_PIPE_H
 #define _CLI_PIPE_H
 
+#include "rpc_client/rpc_client.h"
+
 struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,
                                         struct event_context *ev,
                                         struct rpc_pipe_client *cli,

diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 19dd25578ba81e717b673e60ee27c2b0f8927c96..5baf3e6315f3e4ae6aa3e62edcb67b353fa9dbc1 100644 (file)
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client/rpc_client.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_samr.h"

diff --git a/source3/rpc_client/cli_spoolss.c b/source3/rpc_client/cli_spoolss.c
index f4cea9706405a1503136bb382e8489cff333fc14..831da85205f6c63656176aacdefae77a09a9c9a1 100644 (file)
--- a/source3/rpc_client/cli_spoolss.c
+++ b/source3/rpc_client/cli_spoolss.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
 #include "ntdomain.h"

diff --git a/source3/rpc_client/rpc_client.h b/source3/rpc_client/rpc_client.h
new file mode 100644 (file)
index 0000000..6561b28
--- /dev/null
+++ b/source3/rpc_client/rpc_client.h
@@ -0,0 +1,55 @@
+/*
+ *  Unix SMB/CIFS implementation.
+ *
+ *  RPC Pipe client routines
+ *
+ *  Copyright (c) 2005      Jeremy Allison
+ *  Copyright (c) 2010      Simo Sorce
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _RPC_CLIENT_H
+#define _RPC_CLIENT_H
+
+#include "librpc/gen_ndr/dcerpc.h"
+#include "librpc/rpc/dcerpc.h"
+#include "../librpc/ndr/libndr.h"
+#include "rpc_client/rpc_transport.h"
+
+struct dcerpc_binding_handle;
+
+struct rpc_pipe_client {
+       struct rpc_pipe_client *prev, *next;
+
+       struct rpc_cli_transport *transport;
+       struct dcerpc_binding_handle *binding_handle;
+
+       struct ndr_syntax_id abstract_syntax;
+       struct ndr_syntax_id transfer_syntax;
+
+       char *desthost;
+       char *srv_name_slash;
+
+       uint16 max_xmit_frag;
+       uint16 max_recv_frag;
+
+       struct pipe_auth_data *auth;
+
+       /* The following is only non-null on a netlogon client pipe. */
+       struct netlogon_creds_CredentialState *dc;
+};
+
+#endif /* _RPC_CLIENT_H */

diff --git a/source3/rpc_server/srv_pipe_register.c b/source3/rpc_server/srv_pipe_register.c
index 3753596a2b135502d28f6fbee412ab8b7a999e74..a6d654277ed53e94f8f4d2f95638bdf14d3ccb05 100644 (file)
--- a/source3/rpc_server/srv_pipe_register.c
+++ b/source3/rpc_server/srv_pipe_register.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "librpc/rpc/dcerpc.h"
 #include "srv_pipe_internal.h"
 
 #undef DBGC_CLASS

diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index a04f06227479df89619cc22e2d920270b7d69b14..13297c0222187c02b9353cf6708663bc449c075a 100644 (file)
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -28,6 +28,7 @@
 #include "includes.h"
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index 5697594ac6aafcbe7d5548b45921bc8537fbc87d..cc02ae29dc313f7daca23b63cb2215db06b27517 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -30,6 +30,7 @@
 #include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "fake_file.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"

diff --git a/source3/utils/net_printing.c b/source3/utils/net_printing.c
index 8019d4ff612d5526e4db5666335359b92e4371a7..11c87bb5b4fbceca642ca201aa286295ce30245d 100644 (file)
--- a/source3/utils/net_printing.c
+++ b/source3/utils/net_printing.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "librpc/gen_ndr/ndr_ntprinting.h"
 #include "librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"

diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c
index cd6d1da8c3dd9c0d11f368a892e9e751b1d70416..8179b70d53bd9c4df949dd4078c143e9b69dc4f1 100644 (file)
--- a/source3/utils/net_rpc_audit.c
+++ b/source3/utils/net_rpc_audit.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 

diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 4073e0e2a95842e0bdbb2eff0ab754df7d1658f2..7a225871744bb3b062aa3b69ff7c1b4de83c2c53 100644 (file)
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_spoolss_c.h"
 #include "rpc_client/cli_spoolss.h"
 #include "rpc_client/init_spoolss.h"

diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 190ab05819c9699e210a638b202c740dc7558606..31f4e3ec5fd2018f87d2b12c981071dc5987c210 100644 (file)
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -19,6 +19,7 @@
  
 #include "includes.h"
 #include "system/filesys.h"
+#include "rpc_client/rpc_client.h"
 #include "registry.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 02027f8d925f6f57ceb7da88af41d91fad651690..a2847749b708296ca0c0b94d37b2ae6a31dc7d6e 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -19,6 +19,7 @@
 */
 #include "includes.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/init_lsa.h"

diff --git a/source3/utils/net_rpc_service.c b/source3/utils/net_rpc_service.c
index f1cd2a6b0d91e4313ec65421cad2b7550b3461b2..c5d6954dfcf657c3317b5d0ecd38484b3f6a2099 100644 (file)
--- a/source3/utils/net_rpc_service.c
+++ b/source3/utils/net_rpc_service.c
@@ -18,6 +18,7 @@
 
 #include "includes.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_svcctl.h"
 #include "../librpc/gen_ndr/ndr_svcctl_c.h"
 

diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 6f5604e315181e9a34def56485366d18e29c97b7..6f85be4f88ffc75e529212ac101ed3bfd659c818 100644 (file)
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -18,6 +18,7 @@
 */
 #include "includes.h"
 #include "utils/net.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../libcli/security/security.h"
 

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 4e8045731ac5598f24728cdd2da50f5f147a64d3..dde8e3f53d204eb8c40db350d9774c0e17efde26 100644 (file)
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "winbindd.h"
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../libds/common/flags.h"
 #include "ads.h"

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index ac17bc90c2fd43c33335b60447bf9cd18295328e..ed7d994ca9381a986e3682b797035e84f3a54427 100644 (file)
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -27,6 +27,7 @@
 #include "winbindd.h"
 #include "winbindd_rpc.h"
 
+#include "rpc_client/rpc_client.h"
 #include "librpc/gen_ndr/ndr_samr_c.h"
 #include "librpc/gen_ndr/srv_samr.h"
 #include "librpc/gen_ndr/ndr_lsa_c.h"

diff --git a/source3/winbindd/winbindd_samr.c b/source3/winbindd/winbindd_samr.c
index a1c464013dd90bbeb2bd03b63f558ce702f6898e..f24a14391b69952c3a7d24b92e7d4d1fb36fb851 100644 (file)
--- a/source3/winbindd/winbindd_samr.c
+++ b/source3/winbindd/winbindd_samr.c
@@ -27,6 +27,7 @@
 #include "winbindd.h"
 #include "winbindd_rpc.h"
 
+#include "rpc_client/rpc_client.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "rpc_client/cli_samr.h"
 #include "../librpc/gen_ndr/srv_samr.h"