s3-lsa: separate out init_lsa headers.

Guenther

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 67718a954a424cef47e37e95383ddbdbf1ea152b..c1e471886c6bf13445c32a7d26aa095e20c5b7ce 100644 (file)
--- 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 b8aa4182a341ecebd927664250cbbb6e8f5320b1..53114b5d7d9993fe7c30d44b47524c8977ec8ede 100644 (file)
--- 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 f8832328fe547349f235a9c48f51e2b20c5941b0..03a7a71588e69fc5c018b42f59c5cf723438fbe1 100644 (file)
--- 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 a33be2ad24117db401bc0be31f145cabfa9586f1..fb8e163be051d4ee26276a36513b32b55548b23f 100644 (file)
--- 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 4c274d6e8bf213eb29031386d9273167c9a52dfe..4bbb99e5e798a0e8e68fe99124af16367e334206 100644 (file)
--- 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 7107b32d888f0d08b7b9e3892f14e9d7b7910568..67a7443cd484b81c5f76ea51136499b4273e48e1 100644 (file)
--- 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 7d83dc3253a0bd5fa07f3536f0c6497426e60ffd..349ef55569939207c69c225f31d997ab8b47aa3c 100644 (file)
--- 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 72514e7f5e5693e9e08511d7c21325037c383ede..823bdfac6a4f1ebe0ed939cdf5fe061f9b2fc304 100644 (file)
--- 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 8c1011293afb6b67e963c3b90042318fa2466e1f..7f5e6fca4a92725aa15b92b7190f3939cfe6ec24 100644 (file)
--- 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 96775fd7321527611f548e82a405cd5dab5196e6..d2795dd65cf16b310c4617055a656312adb49384 100644 (file)
--- 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 (file)
index 0000000..f3586a3
--- /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 1a0ddb1892927c102e4b1bf23c20a1af7bb689f7..235ec12b58a87670c28c6560e815356ea7080189 100644 (file)
--- 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 1b0544ff5014bff2b0a52d0c6ef10ab7339a338e..73f216f73a217a9f3136b60f24fa8c0fb9ca6457 100644 (file)
--- 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 127a0cbbffc17e91303073533a767b0387545630..ff7055537fa46a1a7750be7a16abe615e62ebe70 100644 (file)
--- 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 8c4ed4928d24a51365006d0dfc40f0d88ab67d24..481c11317b2fc16b94ea638b65444b1c5226b3cb 100644 (file)
--- 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 9db316f7e49d3ae594f45f0d119b7b7a6a83dcb0..0b11be9df9a7eefa0b8e551c4f3fe418e0145588 100644 (file)
--- 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 37c63aeff229585ef5acfb3fd39276805b02a188..ea943761c889d309020aef3a0806a901d5444933 100644 (file)
--- 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 493a8ec3c621799ac41b612bf9804c72c9757235..1c7d08db37a01c85a5bd27ac1edcfe64848e8731 100644 (file)
--- 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 56eb42e0ed6b0f7ccc8a266fdd62a2a8b547ce28..fe94f7ec88771666ec6490bdaa70dccfe42b01aa 100644 (file)
--- 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 c17dfa4c3264db12c003d672f3861430410496d2..5e672840e4d9b3cb6b4634390695f5a18577f2de 100644 (file)
--- 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 3dc3f85ffb143d91ec72dc3f210c820f24d2c0ff..5af984ee07ba2f20433e04c1be174e07857a10b6 100644 (file)
--- 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"
 
 /********************************************************************
 ********************************************************************/