s3-lsa: separate out init_lsa headers.

Guenther

21 files changed, 25 insertions, 7 deletions

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 67718a954a..c1e471886c 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -4681,13 +4681,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/init_lsa.c  */
-
-void init_lsa_String(struct lsa_String *name, const char *s);
-void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s);
-void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s);
-void init_lsa_AsciiStringLarge(struct lsa_AsciiStringLarge *name, const char *s);
-
 /* 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/group.c b/source3/lib/netapi/group.c
index b8aa4182a3..53114b5d7d 100644
--- a/source3/lib/netapi/group.c
+++ b/source3/lib/netapi/group.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_lsa.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/lib/netapi/localgroup.c b/source3/lib/netapi/localgroup.c
index f8832328fe..03a7a71588 100644
--- a/source3/lib/netapi/localgroup.c
+++ b/source3/lib/netapi/localgroup.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
 
 static NTSTATUS libnetapi_samr_lookup_and_open_alias(TALLOC_CTX *mem_ctx,
 						     struct rpc_pipe_client *pipe_cli,
diff --git a/source3/lib/netapi/samr.c b/source3/lib/netapi/samr.c
index a33be2ad24..fb8e163be0 100644
--- a/source3/lib/netapi/samr.c
+++ b/source3/lib/netapi/samr.c
@@ -22,6 +22,7 @@
 #include "lib/netapi/netapi_private.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
+#include "rpc_client/init_lsa.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/lib/netapi/shutdown.c b/source3/lib/netapi/shutdown.c
index 4c274d6e8b..4bbb99e5e7 100644
--- a/source3/lib/netapi/shutdown.c
+++ b/source3/lib/netapi/shutdown.c
@@ -24,6 +24,7 @@
 #include "lib/netapi/netapi_private.h"
 #include "lib/netapi/libnetapi.h"
 #include "../librpc/gen_ndr/cli_initshutdown.h"
+#include "rpc_client/init_lsa.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/lib/netapi/user.c b/source3/lib/netapi/user.c
index 7107b32d88..67a7443cd4 100644
--- a/source3/lib/netapi/user.c
+++ b/source3/lib/netapi/user.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/init_samr.h"
 #include "../libds/common/flags.h"
+#include "rpc_client/init_lsa.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7d83dc3253..349ef55569 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -33,6 +33,7 @@
 #include "lib/smbconf/smbconf_reg.h"
 #include "../libds/common/flags.h"
 #include "secrets.h"
+#include "rpc_client/init_lsa.h"
 
 /****************************************************************
 ****************************************************************/
diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 72514e7f5e..823bdfac6a 100644
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
 
 /** @defgroup lsa LSA - Local Security Architecture
  *  @ingroup rpc_client
diff --git a/source3/rpc_client/cli_samr.c b/source3/rpc_client/cli_samr.c
index 8c1011293a..7f5e6fca4a 100644
--- a/source3/rpc_client/cli_samr.c
+++ b/source3/rpc_client/cli_samr.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
 #include "../lib/crypto/arcfour.h"
+#include "rpc_client/init_lsa.h"
 
 /* User change password */
 
diff --git a/source3/rpc_client/init_lsa.c b/source3/rpc_client/init_lsa.c
index 96775fd732..d2795dd65c 100644
--- a/source3/rpc_client/init_lsa.c
+++ b/source3/rpc_client/init_lsa.c
@@ -18,6 +18,7 @@
  */
 
 #include "includes.h"
+#include "rpc_client/init_lsa.h"
 
 /*******************************************************************
  inits a structure.
diff --git a/source3/rpc_client/init_lsa.h b/source3/rpc_client/init_lsa.h
new file mode 100644
index 0000000000..f3586a3b59
--- /dev/null
+++ b/source3/rpc_client/init_lsa.h
@@ -0,0 +1,6 @@
+/* The following definitions come from rpc_client/init_lsa.c  */
+
+void init_lsa_String(struct lsa_String *name, const char *s);
+void init_lsa_StringLarge(struct lsa_StringLarge *name, const char *s);
+void init_lsa_AsciiString(struct lsa_AsciiString *name, const char *s);
+void init_lsa_AsciiStringLarge(struct lsa_AsciiStringLarge *name, const char *s);
diff --git a/source3/rpc_server/srv_lsa_nt.c b/source3/rpc_server/srv_lsa_nt.c
index 1a0ddb1892..235ec12b58 100644
--- a/source3/rpc_server/srv_lsa_nt.c
+++ b/source3/rpc_server/srv_lsa_nt.c
@@ -32,6 +32,7 @@
 #include "../librpc/gen_ndr/srv_lsa.h"
 #include "secrets.h"
 #include "../librpc/gen_ndr/netlogon.h"
+#include "rpc_client/init_lsa.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpc_server/srv_netlog_nt.c b/source3/rpc_server/srv_netlog_nt.c
index 1b0544ff50..73f216f73a 100644
--- a/source3/rpc_server/srv_netlog_nt.c
+++ b/source3/rpc_server/srv_netlog_nt.c
@@ -34,6 +34,7 @@
 #include "rpc_client/cli_lsarpc.h"
 #include "librpc/gen_ndr/messaging.h"
 #include "../lib/crypto/md4.h"
+#include "rpc_client/init_lsa.h"
 
 extern userdom_struct current_user_info;
 
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 127a0cbbff..ff7055537f 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -38,6 +38,7 @@
 #include "rpc_server/srv_samr_util.h"
 #include "../lib/crypto/arcfour.h"
 #include "secrets.h"
+#include "rpc_client/init_lsa.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_RPC_SRV
diff --git a/source3/rpcclient/cmd_eventlog.c b/source3/rpcclient/cmd_eventlog.c
index 8c4ed4928d..481c11317b 100644
--- a/source3/rpcclient/cmd_eventlog.c
+++ b/source3/rpcclient/cmd_eventlog.c
@@ -22,6 +22,7 @@
 #include "rpcclient.h"
 #include "../librpc/gen_ndr/ndr_eventlog.h"
 #include "../librpc/gen_ndr/cli_eventlog.h"
+#include "rpc_client/init_lsa.h"
 
 static NTSTATUS get_eventlog_handle(struct rpc_pipe_client *cli,
 				    TALLOC_CTX *mem_ctx,
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 9db316f7e4..0b11be9df9 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -26,6 +26,7 @@
 #include "../librpc/gen_ndr/ndr_lsa.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
 
 /* useful function to allow entering a name instead of a SID and
  * looking it up automatically */
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 37c63aeff2..ea943761c8 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -29,6 +29,7 @@
 #include "../librpc/gen_ndr/cli_samr.h"
 #include "rpc_client/cli_samr.h"
 #include "rpc_client/init_samr.h"
+#include "rpc_client/init_lsa.h"
 
 extern struct dom_sid domain_sid;
 
diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c
index 493a8ec3c6..1c7d08db37 100644
--- a/source3/smbd/lanman.c
+++ b/source3/smbd/lanman.c
@@ -37,6 +37,7 @@
 #include "../librpc/gen_ndr/rap.h"
 #include "../lib/util/binsearch.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "rpc_client/init_lsa.h"
 
 #ifdef CHECK_TYPES
 #undef CHECK_TYPES
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index 56eb42e0ed..fe94f7ec88 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -35,6 +35,7 @@
 #include "../librpc/gen_ndr/cli_winreg.h"
 #include "secrets.h"
 #include "lib/netapi/netapi.h"
+#include "rpc_client/init_lsa.h"
 
 static int net_mode_share;
 static bool sync_files(struct copy_clistate *cp_clistate, const char *mask);
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index c17dfa4c32..5e672840e4 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -28,6 +28,7 @@
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_client/cli_netlogon.h"
 #include "secrets.h"
+#include "rpc_client/init_lsa.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 
diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 3dc3f85ffb..5af984ee07 100644
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -21,6 +21,7 @@
 #include "utils/net.h"
 #include "../librpc/gen_ndr/cli_lsa.h"
 #include "rpc_client/cli_lsarpc.h"
+#include "rpc_client/init_lsa.h"
 
 /********************************************************************
 ********************************************************************/