s3-rpc_client: move protos to cli_samr.h

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 761d0d2bc15a27e9db8bd3f9ef9cbaa5d1a49a79..364632129360e5aa6c4206781a7d148050019329 100644 (file)
--- 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 bef02c4469ca268a5acc88026d3e6e7f0e0b1b36..fa190e637c638ba321ec4205fce228752b84fa1f 100644 (file)
--- 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 466dfae3796bc0ca468f50b969cadbdaec0c5344..4a81a2141774cbfcb2ee14438482677cdbdac20a 100644 (file)
--- 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 36d682b6246528a55e61620ce387283281678113..8c92ebb059c3a54bb0c923e49e9259740e940cb7 100644 (file)
--- 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 (file)
index 0000000..da0be18
--- /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 e61f59027169d06ecbdf2d3038a1e2a55eb41fb4..7f4b50615ecc1cd5d8b58379e3f74022e1e2d30f 100644 (file)
--- 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 0ce2cd5d49635ba3bea6ee7246a9ab17e121775b..73042d5749347124dde0c7aa807977628c7f1045 100644 (file)
--- 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 e212d7b94a075f43a4429d0ff123ea5598029f8f..129fd474205f8a4a3364cf65bf53b60ba1961fe7 100644 (file)
--- 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 793cc430f046d066ec2ff06cee73df8289dbba53..e1c8e2eeda6286d8d286d5af3467d0e29fae0647 100644 (file)
--- 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