s3-rpc_client: move protos to init_samr.h

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index f3954344fc206066eede1594b870688c39791205..6072f07fe9fd34fb116d48cbf2db1062979559c0 100644 (file)
--- 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 1ad4a6f282a090e07121d1f62e24083f579ffc00..249123eef686f07ffdb06bc1163e06b2fdc82837 100644 (file)
--- 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 74ef78b921c8142dd9464781c82ba9a033cafac7..a4aecd21126d446436a4e5ffd2fd811bdc137390 100644 (file)
--- 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 ecab28e719fc15974065ca6ec4c5462858f48695..e3bb3015c26194176a0a3b847ca9c61ad11b090e 100644 (file)
--- 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 (file)
index 0000000..1ddaef6
--- /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 7f4b50615ecc1cd5d8b58379e3f74022e1e2d30f..7cd2f9af884010a2a6433a30fa8c0bd6f31d1da0 100644 (file)
--- 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 ca0268483b0c07b4b72884c19bfc00f0a381edbf..9a88a822193a451dfbf9738ee3cb365a7beab4d2 100644 (file)
--- 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 d180c2bfaa26000e2e6cdf372713c668039aeaa5..742b71e194fa1fc864f58d48525d89aa9dd2162a 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 "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"