s3-rpc_client: move protos to cli_lsarpc.h

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index b5dbeb5012acec41c0cfc0ff69cafbe428f62e10..46bcf8fa16a22e09ea0da56346af9a9aea64ce52 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4862,50 +4862,6 @@ TDB_DATA get_printer_notify_pid_list(TDB_CONTEXT *tdb, const char *printer_name,
 void set_profile_level(int level, struct server_id src);
 bool profile_setup(struct messaging_context *msg_ctx, bool rdonly);
 
-/* The following definitions come from rpc_client/cli_lsarpc.c  */
-
-NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
-                               TALLOC_CTX *mem_ctx,
-                               bool sec_qos, uint32 des_access,
-                               struct policy_handle *pol);
-NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
-                                TALLOC_CTX *mem_ctx, bool sec_qos,
-                                uint32 des_access, struct policy_handle *pol);
-NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
-                               TALLOC_CTX *mem_ctx,
-                               struct policy_handle *pol,
-                               int num_sids,
-                               const DOM_SID *sids,
-                               char ***pdomains,
-                               char ***pnames,
-                               enum lsa_SidType **ptypes);
-NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
-                                TALLOC_CTX *mem_ctx,
-                                struct policy_handle *pol,
-                                int num_sids,
-                                const DOM_SID *sids,
-                                char ***pdomains,
-                                char ***pnames,
-                                enum lsa_SidType **ptypes);
-NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli,
-                                TALLOC_CTX *mem_ctx,
-                                struct policy_handle *pol, int num_names,
-                                const char **names,
-                                const char ***dom_names,
-                                int level,
-                                DOM_SID **sids,
-                                enum lsa_SidType **types);
-NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
-                                 TALLOC_CTX *mem_ctx,
-                                 struct policy_handle *pol, int num_names,
-                                 const char **names,
-                                 const char ***dom_names,
-                                 int level,
-                                 DOM_SID **sids,
-                                 enum lsa_SidType **types);
-
-bool fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid);
-
 /* The following definitions come from rpc_client/cli_pipe.c  */
 
 struct tevent_req *rpc_api_pipe_req_send(TALLOC_CTX *mem_ctx,

diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index b9c0b4c3257796cb9614a64b171469f9941b4488..dd0f8d2097690fa5c96f02f893c3306ed94914e7 100644 (file)
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -25,6 +25,7 @@
 #include "lib/netapi/libnetapi.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
                                                     struct rpc_pipe_client *pipe_cli,

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 5b8faf83eb1764981368a9288a8d4c8c53e6c048..74ef78b921c8142dd9464781c82ba9a033cafac7 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -23,6 +23,7 @@
 #include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
 #include "lib/smbconf/smbconf.h"

diff --git a/source3/libsmb/libsmb_server.c b/source3/libsmb/libsmb_server.c
index 9784253cc2a2d4399898fe3e3e46fc8dde625e50..2150768341f48d551ffa567511c65bdf1dd316f5 100644 (file)
--- a/source3/libsmb/libsmb_server.c
+++ b/source3/libsmb/libsmb_server.c
@@ -27,6 +27,7 @@
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /* 
  * Check a server for being alive and well.

diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index c9eb103a9ea904c74cd0c0423749e8b0f8717244..38a94620770bccc12d568703ebb3d7a536bce464 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/cli_lsarpc.h"
 
 
 /*

diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c
index 0e8e46195659f243aaaf1a408285b5765e71fb4a..6e549f4a23dcdb8177710ab11d1e92c0f22e856f 100644 (file)
--- a/source3/libsmb/trusts_util.c
+++ b/source3/libsmb/trusts_util.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "rpc_client/cli_netlogon.h"
 
 /*********************************************************

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index caa258398ae07569a0ffa7c1ce1daac322293474..481b65b80a5eb7d36c05486ce3459fcba7bde5e8 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /** @defgroup lsa LSA - Local Security Architecture
  *  @ingroup rpc_client

diff --git a/source3/rpc_client/cli_lsarpc.h b/source3/rpc_client/cli_lsarpc.h
new file mode 100644 (file)
index 0000000..188e506
--- /dev/null
+++ b/source3/rpc_client/cli_lsarpc.h
@@ -0,0 +1,44 @@
+/* The following definitions come from rpc_client/cli_lsarpc.c  */
+
+NTSTATUS rpccli_lsa_open_policy(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               bool sec_qos, uint32 des_access,
+                               struct policy_handle *pol);
+NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx, bool sec_qos,
+                                uint32 des_access, struct policy_handle *pol);
+NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,
+                               TALLOC_CTX *mem_ctx,
+                               struct policy_handle *pol,
+                               int num_sids,
+                               const DOM_SID *sids,
+                               char ***pdomains,
+                               char ***pnames,
+                               enum lsa_SidType **ptypes);
+NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx,
+                                struct policy_handle *pol,
+                                int num_sids,
+                                const DOM_SID *sids,
+                                char ***pdomains,
+                                char ***pnames,
+                                enum lsa_SidType **ptypes);
+NTSTATUS rpccli_lsa_lookup_names(struct rpc_pipe_client *cli,
+                                TALLOC_CTX *mem_ctx,
+                                struct policy_handle *pol, int num_names,
+                                const char **names,
+                                const char ***dom_names,
+                                int level,
+                                DOM_SID **sids,
+                                enum lsa_SidType **types);
+NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct policy_handle *pol, int num_names,
+                                 const char **names,
+                                 const char ***dom_names,
+                                 int level,
+                                 DOM_SID **sids,
+                                 enum lsa_SidType **types);
+
+bool fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid);
+

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index bc9efcd21c982673928b0c2f12bfa4f8a0238f43..6ddcc55b20741a59b8adedb6ea964c2c59a0753f 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -24,6 +24,7 @@
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */

diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index e12e703f3eae044b85ade00687d400ff358dd21e..263c45e5a2e3410bf72d59a56bf8662197daf11c 100644 (file)
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
                           int argc, const char **argv)

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 68418cd483d30c78e658a199cd9a9ccdb201c145..19693920dce29d1ee7946a9fcb6cc7bfa6847174 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -23,6 +23,7 @@
 #include "rpcclient.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
 

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 73042d5749347124dde0c7aa807977628c7f1045..ca0268483b0c07b4b72884c19bfc00f0a381edbf 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
 #include "../librpc/gen_ndr/cli_srvsvc.h"
 #include "../librpc/gen_ndr/cli_spoolss.h"

diff --git a/source3/utils/net_rpc_audit.c b/source3/utils/net_rpc_audit.c
index ceea9f69704381cc640511eaeafa15b1b4c758eb..90d30a6084b50796279d13bb7e234ec3dfb32af0 100644 (file)
--- a/source3/utils/net_rpc_audit.c
+++ b/source3/utils/net_rpc_audit.c
@@ -19,6 +19,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /********************************************************************
 ********************************************************************/

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 59e92ffbd4e219452ec5afb45e848268d5df2c57..d180c2bfaa26000e2e6cdf372713c668039aeaa5 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -22,6 +22,7 @@
 #include "utils/net.h"
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 8555154471b667cd2adb4653f4f8458c98f8985a..6b7ca7ec4f83bfd4a787a9d98ca5f1e39bcb19f3 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -20,6 +20,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /********************************************************************
 ********************************************************************/

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index bfa56a7016ea4e4b6d5c7c439d9dba9d1860910f..191bc52c6b56f5eb2ff3a3a68620080d88b50588 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_dssetup.h"
 
 NTSTATUS net_rpc_lookup_name(struct net_context *c,

diff --git a/source3/utils/netlookup.c b/source3/utils/netlookup.c
index 3fa219998b5be44e7854a322650c4bbdb69ee842..a49583d9e51d56201043c82bbf713b91bbcdd4f7 100644 (file)
--- a/source3/utils/netlookup.c
+++ b/source3/utils/netlookup.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 /********************************************************
  Connection cachine struct. Goes away when ctx destroyed.

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 2344f2f0ab3c8ea07603352a3b78b5bb483349b4..11ced83bf67a1f8bd48d12f457eaea9145f2e384 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 extern bool AllowDebugChange;
 

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 49a10e51372d0d578291935e70b3d14b7abaaafb..a494c3f4aad1f7c5b23bfef01fe31eff8f5b56af 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 static char *server;
 

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 7f4a94a8b252045867d99bcab106eb4cfa4ee355..64dd69069c4a77853528c793297d40036860b23d 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -65,6 +65,7 @@
 #include "rpc_client/cli_netlogon.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_dssetup.h"
 #include "libads/sitename_cache.h"
 #include "librpc/gen_ndr/messaging.h"

diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index e1c8e2eeda6286d8d286d5af3467d0e29fae0647..0111191d8383172f67ff43a60f54eb1d361c2967 100644 (file)
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -27,6 +27,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
+#include "rpc_client/cli_lsarpc.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND