From 230b880d142eea46d4131f2b44774465c9c214bc Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 18:26:16 +0200 Subject: s3-rpc_client: move protos to cli_lsarpc.h Guenther --- source3/include/proto.h | 44 ----------------------------------------- source3/lib/netapi/localgroup.c | 1 + source3/libnet/libnet_join.c | 1 + source3/libsmb/libsmb_server.c | 1 + source3/libsmb/libsmb_xattr.c | 1 + source3/libsmb/trusts_util.c | 1 + source3/rpc_client/cli_lsarpc.c | 1 + source3/rpc_client/cli_lsarpc.h | 44 +++++++++++++++++++++++++++++++++++++++++ source3/rpcclient/cmd_lsarpc.c | 1 + source3/rpcclient/cmd_test.c | 1 + source3/rpcclient/rpcclient.c | 1 + source3/utils/net_rpc.c | 1 + source3/utils/net_rpc_audit.c | 1 + source3/utils/net_rpc_join.c | 1 + source3/utils/net_rpc_rights.c | 1 + source3/utils/net_util.c | 1 + source3/utils/netlookup.c | 1 + source3/utils/smbcacls.c | 1 + source3/utils/smbcquotas.c | 1 + source3/winbindd/winbindd_cm.c | 1 + source3/winbindd/winbindd_rpc.c | 1 + 21 files changed, 63 insertions(+), 44 deletions(-) create mode 100644 source3/rpc_client/cli_lsarpc.h diff --git a/source3/include/proto.h b/source3/include/proto.h index b5dbeb5012..46bcf8fa16 100644 --- 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 b9c0b4c325..dd0f8d2097 100644 --- 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 5b8faf83eb..74ef78b921 100644 --- 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 9784253cc2..2150768341 100644 --- 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 c9eb103a9e..38a9462077 100644 --- 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 0e8e461956..6e549f4a23 100644 --- 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 caa258398a..481b65b80a 100644 --- 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 index 0000000000..188e5063d3 --- /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 bc9efcd21c..6ddcc55b20 100644 --- 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 e12e703f3e..263c45e5a2 100644 --- 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 68418cd483..19693920dc 100644 --- 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 73042d5749..ca0268483b 100644 --- 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 ceea9f6970..90d30a6084 100644 --- 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 59e92ffbd4..d180c2bfaa 100644 --- 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 8555154471..6b7ca7ec4f 100644 --- 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 bfa56a7016..191bc52c6b 100644 --- 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 3fa219998b..a49583d9e5 100644 --- 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 2344f2f0ab..11ced83bf6 100644 --- 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 49a10e5137..a494c3f4aa 100644 --- 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 7f4a94a8b2..64dd69069c 100644 --- 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 e1c8e2eeda..0111191d83 100644 --- 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 -- cgit