diff options
-rw-r--r-- | source3/auth/auth_domain.c | 1 | ||||
-rw-r--r-- | source3/auth/auth_netlogond.c | 1 | ||||
-rw-r--r-- | source3/include/proto.h | 49 | ||||
-rw-r--r-- | source3/libnet/libnet_join.c | 1 | ||||
-rw-r--r-- | source3/libsmb/trusts_util.c | 1 | ||||
-rw-r--r-- | source3/rpc_client/cli_netlogon.c | 1 | ||||
-rw-r--r-- | source3/rpc_client/cli_netlogon.h | 48 | ||||
-rw-r--r-- | source3/rpc_client/cli_pipe.c | 1 | ||||
-rw-r--r-- | source3/rpcclient/cmd_netlogon.c | 1 | ||||
-rw-r--r-- | source3/rpcclient/rpcclient.c | 1 | ||||
-rw-r--r-- | source3/utils/net_rpc_join.c | 1 | ||||
-rw-r--r-- | source3/winbindd/winbindd_cm.c | 1 | ||||
-rw-r--r-- | source3/winbindd/winbindd_pam.c | 1 |
13 files changed, 59 insertions, 49 deletions
diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c index 82e8182ca3..ef58250ce0 100644 --- a/source3/auth/auth_domain.c +++ b/source3/auth/auth_domain.c @@ -21,6 +21,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/ndr_netlogon.h" +#include "rpc_client/cli_netlogon.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source3/auth/auth_netlogond.c b/source3/auth/auth_netlogond.c index 08dc4dc57e..e5f2a1bd4e 100644 --- a/source3/auth/auth_netlogond.c +++ b/source3/auth/auth_netlogond.c @@ -20,6 +20,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/ndr_netlogon.h" +#include "rpc_client/cli_netlogon.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_AUTH diff --git a/source3/include/proto.h b/source3/include/proto.h index 3646321293..b5dbeb5012 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4862,7 +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, @@ -4907,54 +4906,6 @@ NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli, bool fetch_domain_sid( char *domain, char *remote_machine, DOM_SID *psid); -/* The following definitions come from rpc_client/cli_netlogon.c */ - -NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli, - const char *server_name, - const char *domain, - const char *clnt_name, - const char *machine_account, - const unsigned char machine_pwd[16], - enum netr_SchannelType sec_chan_type, - uint32_t *neg_flags_inout); -NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32 logon_parameters, - const char *domain, - const char *username, - const char *password, - const char *workstation, - int logon_type); -NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32 logon_parameters, - const char *server, - const char *username, - const char *domain, - const char *workstation, - const uint8 chal[8], - DATA_BLOB lm_response, - DATA_BLOB nt_response, - struct netr_SamInfo3 **info3); -NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - uint32 logon_parameters, - const char *server, - const char *username, - const char *domain, - const char *workstation, - const uint8 chal[8], - DATA_BLOB lm_response, - DATA_BLOB nt_response, - struct netr_SamInfo3 **info3); -NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli, - TALLOC_CTX *mem_ctx, - const char *account_name, - const unsigned char orig_trust_passwd_hash[16], - const char *new_trust_pwd_cleartext, - const unsigned char new_trust_passwd_hash[16], - enum netr_SchannelType sec_channel_type); - /* 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/libnet/libnet_join.c b/source3/libnet/libnet_join.c index 7d19c63d75..5b8faf83eb 100644 --- a/source3/libnet/libnet_join.c +++ b/source3/libnet/libnet_join.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/cli_netlogon.h" +#include "rpc_client/cli_netlogon.h" #include "lib/smbconf/smbconf.h" #include "lib/smbconf/smbconf_reg.h" diff --git a/source3/libsmb/trusts_util.c b/source3/libsmb/trusts_util.c index 8acdc0fa59..0e8e461956 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_netlogon.h" /********************************************************* Change the domain password on the PDC. diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c index 3c4ddc21a4..781fa05dc5 100644 --- a/source3/rpc_client/cli_netlogon.c +++ b/source3/rpc_client/cli_netlogon.c @@ -23,6 +23,7 @@ #include "includes.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_netlogon.h" +#include "rpc_client/cli_netlogon.h" /**************************************************************************** Wrapper function that uses the auth and auth2 calls to set up a NETLOGON diff --git a/source3/rpc_client/cli_netlogon.h b/source3/rpc_client/cli_netlogon.h new file mode 100644 index 0000000000..107c222cee --- /dev/null +++ b/source3/rpc_client/cli_netlogon.h @@ -0,0 +1,48 @@ +/* The following definitions come from rpc_client/cli_netlogon.c */ + +NTSTATUS rpccli_netlogon_setup_creds(struct rpc_pipe_client *cli, + const char *server_name, + const char *domain, + const char *clnt_name, + const char *machine_account, + const unsigned char machine_pwd[16], + enum netr_SchannelType sec_chan_type, + uint32_t *neg_flags_inout); +NTSTATUS rpccli_netlogon_sam_logon(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32 logon_parameters, + const char *domain, + const char *username, + const char *password, + const char *workstation, + int logon_type); +NTSTATUS rpccli_netlogon_sam_network_logon(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32 logon_parameters, + const char *server, + const char *username, + const char *domain, + const char *workstation, + const uint8 chal[8], + DATA_BLOB lm_response, + DATA_BLOB nt_response, + struct netr_SamInfo3 **info3); +NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + uint32 logon_parameters, + const char *server, + const char *username, + const char *domain, + const char *workstation, + const uint8 chal[8], + DATA_BLOB lm_response, + DATA_BLOB nt_response, + struct netr_SamInfo3 **info3); +NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli, + TALLOC_CTX *mem_ctx, + const char *account_name, + const unsigned char orig_trust_passwd_hash[16], + const char *new_trust_pwd_cleartext, + const unsigned char new_trust_passwd_hash[16], + enum netr_SchannelType sec_channel_type); + diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 210f1389fd..038e33ae8a 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -40,6 +40,7 @@ #include "../libcli/auth/spnego.h" #include "smb_krb5.h" #include "ntlmssp.h" +#include "rpc_client/cli_netlogon.h" #undef DBGC_CLASS #define DBGC_CLASS DBGC_RPC_CLI diff --git a/source3/rpcclient/cmd_netlogon.c b/source3/rpcclient/cmd_netlogon.c index 6317f8b389..262975bc94 100644 --- a/source3/rpcclient/cmd_netlogon.c +++ b/source3/rpcclient/cmd_netlogon.c @@ -23,6 +23,7 @@ #include "rpcclient.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_netlogon.h" +#include "rpc_client/cli_netlogon.h" static WERROR cmd_netlogon_logon_ctrl2(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, int argc, diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c index d83fd17ae3..68418cd483 100644 --- a/source3/rpcclient/rpcclient.c +++ b/source3/rpcclient/rpcclient.c @@ -24,6 +24,7 @@ #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/ndr_netlogon.h" +#include "rpc_client/cli_netlogon.h" DOM_SID domain_sid; diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c index 71fcc0945c..59e92ffbd4 100644 --- a/source3/utils/net_rpc_join.c +++ b/source3/utils/net_rpc_join.c @@ -24,6 +24,7 @@ #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" +#include "rpc_client/cli_netlogon.h" /* Macro for checking RPC error codes to make things more readable */ diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c index 5ea5196508..7f4a94a8b2 100644 --- a/source3/winbindd/winbindd_cm.c +++ b/source3/winbindd/winbindd_cm.c @@ -62,6 +62,7 @@ #include "winbindd.h" #include "../libcli/auth/libcli_auth.h" #include "../librpc/gen_ndr/cli_netlogon.h" +#include "rpc_client/cli_netlogon.h" #include "../librpc/gen_ndr/cli_samr.h" #include "../librpc/gen_ndr/cli_lsa.h" #include "../librpc/gen_ndr/cli_dssetup.h" diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c index 129fd47420..f2e3829361 100644 --- a/source3/winbindd/winbindd_pam.c +++ b/source3/winbindd/winbindd_pam.c @@ -28,6 +28,7 @@ #include "../librpc/gen_ndr/cli_samr.h" #include "rpc_client/cli_samr.h" #include "../librpc/gen_ndr/ndr_netlogon.h" +#include "rpc_client/cli_netlogon.h" #include "smb_krb5.h" #include "../lib/crypto/arcfour.h" |