From 8478770c357f712f1fc3b8a0a9a5f9e730388abb Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Tue, 18 May 2010 18:59:45 +0200
Subject: s3-rpc_client: move protos to init_samr.h

Guenther
---
 source3/include/proto.h        | 9 ---------
 source3/lib/netapi/user.c      | 1 +
 source3/libnet/libnet_join.c   | 1 +
 source3/rpc_client/init_samr.c | 1 +
 source3/rpc_client/init_samr.h | 9 +++++++++
 source3/rpcclient/cmd_samr.c   | 1 +
 source3/utils/net_rpc.c        | 1 +
 source3/utils/net_rpc_join.c   | 1 +
 8 files changed, 15 insertions(+), 9 deletions(-)
 create mode 100644 source3/rpc_client/init_samr.h

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f3954344fc2..6072f07fe9f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -5036,15 +5036,6 @@ void init_netr_CryptPassword(const char *pwd,
 			     unsigned char session_key[16],
 			     struct netr_CryptPassword *pwd_buf);
 
-/* The following definitions come from rpc_client/init_samr.c  */
-
-void init_samr_CryptPasswordEx(const char *pwd,
-			       DATA_BLOB *session_key,
-			       struct samr_CryptPasswordEx *pwd_buf);
-void init_samr_CryptPassword(const char *pwd,
-			     DATA_BLOB *session_key,
-			     struct samr_CryptPassword *pwd_buf);
-
 /* The following definitions come from rpc_client/ndr.c  */
 
 struct tevent_req *cli_do_rpc_ndr_send(TALLOC_CTX *mem_ctx,
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 1ad4a6f282a..249123eef68 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -24,6 +24,7 @@
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/init_samr.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 74ef78b921c..a4aecd21126 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -22,6 +22,7 @@
 #include "libnet/libnet.h"
 #include "libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/init_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
index ecab28e719f..e3bb3015c26 100644
--- a/source3/rpc_client/init_samr.c
+++ b/source3/rpc_client/init_samr.c
@@ -21,6 +21,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../lib/crypto/md5.h"
 #include "../lib/crypto/arcfour.h"
+#include "rpc_client/init_samr.h"
 
 /*************************************************************************
  inits a samr_CryptPasswordEx structure
diff --git a/source3/rpc_client/init_samr.h b/source3/rpc_client/init_samr.h
new file mode 100644
index 00000000000..1ddaef66153
--- /dev/null
+++ b/source3/rpc_client/init_samr.h
@@ -0,0 +1,9 @@
+/* The following definitions come from rpc_client/init_samr.c  */
+
+void init_samr_CryptPasswordEx(const char *pwd,
+			       DATA_BLOB *session_key,
+			       struct samr_CryptPasswordEx *pwd_buf);
+void init_samr_CryptPassword(const char *pwd,
+			     DATA_BLOB *session_key,
+			     struct samr_CryptPassword *pwd_buf);
+
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 7f4b50615ec..7cd2f9af884 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -27,6 +27,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
+#include "rpc_client/init_samr.h"
 
 extern DOM_SID domain_sid;
 
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index ca0268483b0..9a88a822193 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -25,6 +25,7 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
+#include "rpc_client/init_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_netlogon.h"
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index d180c2bfaa2..742b71e194f 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 "rpc_client/cli_lsarpc.h"
 #include "../librpc/gen_ndr/cli_samr.h"
+#include "rpc_client/init_samr.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
 
-- 
cgit