From 3f2719c20296d55766bf6d9f43dea50ab259e0e6 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Tue, 18 May 2010 18:25:50 +0200 Subject: s3-rpc_client: move protos to cli_samr.h Guenther --- source3/include/proto.h | 33 --------------------------------- source3/lib/netapi/samr.c | 1 + source3/libsmb/passchange.c | 1 + source3/rpc_client/cli_samr.c | 1 + source3/rpc_client/cli_samr.h | 33 +++++++++++++++++++++++++++++++++ source3/rpcclient/cmd_samr.c | 1 + source3/utils/net_rpc.c | 1 + source3/winbindd/winbindd_pam.c | 1 + source3/winbindd/winbindd_rpc.c | 1 + 9 files changed, 40 insertions(+), 33 deletions(-) create mode 100644 source3/rpc_client/cli_samr.h (limited to 'source3') diff --git a/source3/include/proto.h b/source3/include/proto.h index 761d0d2bc1..3646321293 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5104,39 +5104,6 @@ struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p); NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd, struct rpc_cli_transport **presult); -/* The following definitions come from rpc_client/cli_samr.c */ - -NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - struct policy_handle *user_handle, - const char *newpassword, - const char *oldpassword); -NTSTATUS rpccli_samr_chgpasswd_user2(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *username, - const char *newpassword, - const char *oldpassword); -NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *username, - DATA_BLOB new_nt_password_blob, - DATA_BLOB old_nt_hash_enc_blob, - DATA_BLOB new_lm_password_blob, - DATA_BLOB old_lm_hash_enc_blob); -NTSTATUS rpccli_samr_chgpasswd_user3(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *username, - const char *newpassword, - const char *oldpassword, - struct samr_DomInfo1 **dominfo1, - struct userPwdChangeFailureInformation **reject); -void get_query_dispinfo_params(int loop_count, uint32 *max_entries, - uint32 *max_size); -NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32_t access_mask, - struct policy_handle *connect_pol); - /* The following definitions come from rpc_client/cli_spoolss.c */ WERROR rpccli_spoolss_openprinter_ex(struct rpc_pipe_client *cli, diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c index bef02c4469..fa190e637c 100644 --- a/source3/lib/netapi/samr.c +++ b/source3/lib/netapi/samr.c @@ -21,6 +21,7 @@ #include "lib/netapi/netapi.h" #include "lib/netapi/netapi_private.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" /**************************************************************** ****************************************************************/ diff --git a/source3/libsmb/passchange.c b/source3/libsmb/passchange.c index 466dfae379..4a81a21417 100644 --- a/source3/libsmb/passchange.c +++ b/source3/libsmb/passchange.c @@ -18,6 +18,7 @@ */ #include "includes.h" +#include "rpc_client/cli_samr.h" /************************************************************* Change a password on a remote machine using IPC calls. diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c index 36d682b624..8c92ebb059 100644 --- a/source3/rpc_client/cli_samr.c +++ b/source3/rpc_client/cli_samr.c @@ -24,6 +24,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" #include "../lib/crypto/arcfour.h" /* User change password */ diff --git a/source3/rpc_client/cli_samr.h b/source3/rpc_client/cli_samr.h new file mode 100644 index 0000000000..da0be1836c --- /dev/null +++ b/source3/rpc_client/cli_samr.h @@ -0,0 +1,33 @@ +/* The following definitions come from rpc_client/cli_samr.c */ + +NTSTATUS rpccli_samr_chgpasswd_user(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + struct policy_handle *user_handle, + const char *newpassword, + const char *oldpassword); +NTSTATUS rpccli_samr_chgpasswd_user2(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *username, + const char *newpassword, + const char *oldpassword); +NTSTATUS rpccli_samr_chng_pswd_auth_crap(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *username, + DATA_BLOB new_nt_password_blob, + DATA_BLOB old_nt_hash_enc_blob, + DATA_BLOB new_lm_password_blob, + DATA_BLOB old_lm_hash_enc_blob); +NTSTATUS rpccli_samr_chgpasswd_user3(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *username, + const char *newpassword, + const char *oldpassword, + struct samr_DomInfo1 **dominfo1, + struct userPwdChangeFailureInformation **reject); +void get_query_dispinfo_params(int loop_count, uint32 *max_entries, + uint32 *max_size); +NTSTATUS rpccli_try_samr_connects(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32_t access_mask, + struct policy_handle *connect_pol); + diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c index e61f590271..7f4b50615e 100644 --- a/source3/rpcclient/cmd_samr.c +++ b/source3/rpcclient/cmd_samr.c @@ -26,6 +26,7 @@ #include "rpcclient.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" extern DOM_SID domain_sid; diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 0ce2cd5d49..73042d5749 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -24,6 +24,7 @@ #include "utils/net.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/cli_netlogon.h" #include "../librpc/gen_ndr/cli_srvsvc.h" diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index e212d7b94a..129fd47420 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -26,6 +26,7 @@ #include "winbindd.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" #include "smb_krb5.h" #include "../lib/crypto/arcfour.h" diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c index 793cc430f0..e1c8e2eeda 100644 --- a/source3/winbindd/winbindd_rpc.c +++ b/source3/winbindd/winbindd_rpc.c @@ -25,6 +25,7 @@ #include "includes.h" #include "winbindd.h" #include "../librpc/gen_ndr/cli_samr.h" +#include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #undef DBGC_CLASS -- cgit