s3-rpc_client: move protos to cli_netlogon.h

Guenther

diff --git a/source3/auth/auth_domain.c b/source3/auth/auth_domain.c
index 82e8182ca31dd3adc485acbd6720f0978880c867..ef58250ce0f5a908051e653270e7ba8410005438 100644 (file)
--- 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 08dc4dc57e6d1ab3aabb4d519665dbbe8e825164..e5f2a1bd4eb741172448ca65c6eb1c60afbe3362 100644 (file)
--- 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 364632129360e5aa6c4206781a7d148050019329..b5dbeb5012acec41c0cfc0ff69cafbe428f62e10 100644 (file)
--- 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 7d19c63d757235c8b1a2ef179f589c06650d15c2..5b8faf83eb1764981368a9288a8d4c8c53e6c048 100644 (file)
--- 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 8acdc0fa59ba2bfa6824bc20308c874ebc2bc4d2..0e8e46195659f243aaaf1a408285b5765e71fb4a 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_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 3c4ddc21a429eee9cfa41a79110dfc343575b3b5..781fa05dc509f1e119841bdaab095f31b390c70b 100644 (file)
--- 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 (file)
index 0000000..107c222
--- /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 210f1389fdc39dcf99bb56339bf8b94883cd03fb..038e33ae8a475a30a5fd3bbe412c1fa19e740ace 100644 (file)
--- 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 6317f8b389a1c47e615bb424dfbd94a16fadc965..262975bc94c31d2e74f944764572e4b951653ab0 100644 (file)
--- 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 d83fd17ae3bae90d474ef943122a6cfabccf0b0f..68418cd483d30c78e658a199cd9a9ccdb201c145 100644 (file)
--- 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 71fcc0945c4c82889642e0e66880ef5ac8c452d6..59e92ffbd4e219452ec5afb45e848268d5df2c57 100644 (file)
--- 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 5ea5196508e6ac336b6ca0fac730d2b7a7061f9c..7f4a94a8b252045867d99bcab106eb4cfa4ee355 100644 (file)
--- 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 129fd474205f8a4a3364cf65bf53b60ba1961fe7..f2e3829361985b1f92e0e1006938b32052d501b8 100644 (file)
--- 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"