The branch, master has been updated
via c5ffecb... s3-build: further rationalise LIBMSRPC_OBJ and remove
RPC_CLIENT_OBJ.
via 6a795dd... s3-waf: further rationalise LIBMSRPC_SRC and remove
RPC_CLIENT_SRC.
via d6949f5... s3-build: remove RPC_CLIENT_OBJ1.
via 75e55f9... s3-waf: remove RPC_CLIENT_SRC1.
via a52fde4... s3-build: use LIBMSRPC_OBJ instead of single files.
via 1217c4f... s3-waf: use LIBMSRPC_SRC instead of single files.
via 0b05e32... s3-waf: only link in samr util code where needed.
via 4991af4... s3-build: only link in samr util code where needed.
via ecf32c8... s3-build: remove RPC_PARSE_OBJ.
via 83dc831... s3-waf: remove RPC_PARSE_SRC.
via 88720f8... s3-build: only link in epmapper client code where needed.
via 4d78984... s3-waf: only link in epmapper client code where needed.
via ff5ab04... s3-build: only link in netlogon client code where needed.
via 13cff58... s3-waf: only link in netlogon client code where needed.
via 0ed16e9... s3: separate out cli schannel functions that depend on
cli_netlogon.
via 064826c... s3-build: only link in samr client code where needed.
via 6810ead... s3-waf: only link in samr client code where needed.
via 1895d66... s3-build: only link in lsa client code where needed.
via c107c66... s3-waf: only link in lsa client code where needed.
via 562c599... s3-build: only link in srvsvc client code where needed.
via 0d0deba... s3-waf: only link in srvsvc client code where needed.
via 0ae0ca0... s3-build: only link in wkssvc client code where needed.
via cfca946... s3-waf: only link in wkssvc client code where needed.
via 2190386... s3-build: only link in svcctl client code where needed.
via 03269d6... s3-waf: only link in svcctl client code where needed.
via 9a195fd... s3-build: only link in dssetup client code where needed.
via 2d72cab... s3-waf: only link in dssetup client code where needed.
via 5c8b548... s3-build: only link in initshutdown client code where
needed.
via e25e9be... s3-waf: only link in initshutdown client code where
needed.
via f97ff9d... s3-build: only link in echo client code where needed.
via 3b24db6... s3-waf: only link in eventlog echo code where needed.
via 0f10349... s3-build: only link in dfs client code where needed.
via 09b973f... s3-waf: only link in dfs client code where needed.
via a66bb0d... s3-build: only link in drsuapi client code where needed.
via bd22ef7... s3-waf: only link in drsuapi client code where needed.
via 4dbb682... s3-build: only link in ntsvcs client code where needed.
via 1a00dd4... s3-waf: only link in ntsvcs client code where needed.
via 50df1c6... s3-build: only link in winreg client code where needed.
via ad855c0... s3-waf: only link in winreg client code where needed.
via 2af95fc... s3-build: only link in eventlog client code where needed.
via dc66329... s3-build: only link in spoolss client code where needed.
via 72f30e8... s3-waf: only link in spoolss client code where needed.
via e978a3d... s3-lsa: separate out init_lsa headers.
from aa54d23... s4-pynet: some systems don't have Py_TYPE()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c5ffecb136225dba294327cc3a437e5f17475253
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:13:55 2010 +0200
s3-build: further rationalise LIBMSRPC_OBJ and remove RPC_CLIENT_OBJ.
Guenther
commit 6a795dd14674bfa2f6fe5206a9237f867c48e875
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:13:00 2010 +0200
s3-waf: further rationalise LIBMSRPC_SRC and remove RPC_CLIENT_SRC.
Guenther
commit d6949f58fa82196fc67a87e6bf47a5c05698a734
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:05:34 2010 +0200
s3-build: remove RPC_CLIENT_OBJ1.
Guenther
commit 75e55f9535d3a66933c901658c61e1fdaa596515
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:05:16 2010 +0200
s3-waf: remove RPC_CLIENT_SRC1.
Guenther
commit a52fde4f944bf8cfa2dd69498bdf6da8e39c0139
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:03:42 2010 +0200
s3-build: use LIBMSRPC_OBJ instead of single files.
Guenther
commit 1217c4f48490e85ac953a3f285b0d9bacda0f243
Author: Günther Deschner <[email protected]>
Date: Thu Aug 26 00:03:15 2010 +0200
s3-waf: use LIBMSRPC_SRC instead of single files.
Guenther
commit 0b05e32f92cfc64de1c3ce02d1eb3ab4f8d5a25f
Author: Günther Deschner <[email protected]>
Date: Fri Aug 20 00:11:33 2010 +0200
s3-waf: only link in samr util code where needed.
Guenther
commit 4991af46d75018c31ec80dc28c3eabd6e541b8ab
Author: Günther Deschner <[email protected]>
Date: Fri Aug 20 00:10:14 2010 +0200
s3-build: only link in samr util code where needed.
Guenther
commit ecf32c851a9b40d1f280e57770f8126420e52f86
Author: Günther Deschner <[email protected]>
Date: Thu Aug 19 16:18:10 2010 +0200
s3-build: remove RPC_PARSE_OBJ.
Guenther
commit 83dc8314f1a688dc43ae5129fb7b1edb74670202
Author: Günther Deschner <[email protected]>
Date: Thu Aug 19 16:25:55 2010 +0200
s3-waf: remove RPC_PARSE_SRC.
Guenther
commit 88720f80c5682ae8043f2c0558cc43354ad472b7
Author: Günther Deschner <[email protected]>
Date: Wed Aug 25 23:53:24 2010 +0200
s3-build: only link in epmapper client code where needed.
Guenther
commit 4d78984570223a803353490b1fa39793ba9b98b3
Author: Günther Deschner <[email protected]>
Date: Tue Aug 17 00:59:23 2010 +0200
s3-waf: only link in epmapper client code where needed.
Guenther
commit ff5ab04882b1ae5940b0e9f41174d6e4e4b8f863
Author: Günther Deschner <[email protected]>
Date: Wed Aug 25 23:15:52 2010 +0200
s3-build: only link in netlogon client code where needed.
Guenther
commit 13cff589178fdb03dfa35113930e85c50e368494
Author: Günther Deschner <[email protected]>
Date: Wed Aug 25 23:14:33 2010 +0200
s3-waf: only link in netlogon client code where needed.
Guenther
commit 0ed16e94c374efb06650f741827bcbed85f1af59
Author: Günther Deschner <[email protected]>
Date: Tue Aug 17 00:46:25 2010 +0200
s3: separate out cli schannel functions that depend on cli_netlogon.
Guenther
commit 064826c4d17f71e30386ff775935f86dd426f124
Author: Günther Deschner <[email protected]>
Date: Fri Aug 13 12:32:53 2010 +0200
s3-build: only link in samr client code where needed.
Guenther
commit 6810ead40dc216c17c6ba1a9731d2598bf342c6d
Author: Günther Deschner <[email protected]>
Date: Fri Aug 13 12:27:20 2010 +0200
s3-waf: only link in samr client code where needed.
Guenther
commit 1895d669c260dfd0632d8ff88759bfd407286fa1
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 19:13:16 2010 +0200
s3-build: only link in lsa client code where needed.
Guenther
commit c107c662030d8874d4e359a1ec5075b4bfa6c39a
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 19:06:57 2010 +0200
s3-waf: only link in lsa client code where needed.
Guenther
commit 562c5999ec636227a3b66bba314481f8367df90a
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:58:49 2010 +0200
s3-build: only link in srvsvc client code where needed.
Guenther
commit 0d0deba7bc8a8b1d7cdfa54f25111d9002ca50ee
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:52:23 2010 +0200
s3-waf: only link in srvsvc client code where needed.
Guenther
commit 0ae0ca062bb040cc317cc767f37bfa693fb498a1
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:47:51 2010 +0200
s3-build: only link in wkssvc client code where needed.
Guenther
commit cfca94656a182522e1c36feda3455a05277cf486
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:47:38 2010 +0200
s3-waf: only link in wkssvc client code where needed.
Guenther
commit 2190386518d9f10f754f91785b1f78b584f3cf4b
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:42:06 2010 +0200
s3-build: only link in svcctl client code where needed.
Guenther
commit 03269d678351ea14cfede4d30291ca1bde294ff8
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:41:45 2010 +0200
s3-waf: only link in svcctl client code where needed.
Guenther
commit 9a195fd2330c13b3e9cb4029d41f640e85738d14
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:36:16 2010 +0200
s3-build: only link in dssetup client code where needed.
Guenther
commit 2d72cab5d088fb87e23eebe45cea6735a2770712
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:36:06 2010 +0200
s3-waf: only link in dssetup client code where needed.
Guenther
commit 5c8b54820bf8b57977c38536a5a3e6c76c21dfe2
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:30:57 2010 +0200
s3-build: only link in initshutdown client code where needed.
Guenther
commit e25e9bec2489fe9ac13b59747ec1786969166889
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:30:46 2010 +0200
s3-waf: only link in initshutdown client code where needed.
Guenther
commit f97ff9d440316416eb91e30a48bffdf2aa207610
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:22:31 2010 +0200
s3-build: only link in echo client code where needed.
Guenther
commit 3b24db6bf8fd0e9e8ff21cf4578256f8462d26ef
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 18:22:19 2010 +0200
s3-waf: only link in eventlog echo code where needed.
Guenther
commit 0f10349f14e2439dedc2448d3649a5fea53c9dd4
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:50:37 2010 +0200
s3-build: only link in dfs client code where needed.
Guenther
commit 09b973f6bb9801c75cf623019b4b6b830ec8fae0
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:47:48 2010 +0200
s3-waf: only link in dfs client code where needed.
Guenther
commit a66bb0d8ec40208020b4ce8cf80e110ec8e2a5e2
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:45:54 2010 +0200
s3-build: only link in drsuapi client code where needed.
Guenther
commit bd22ef79c2a8167da0783f9759fd7df63554a146
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:42:59 2010 +0200
s3-waf: only link in drsuapi client code where needed.
Guenther
commit 4dbb682bc5ee9b1893ad815b710aac46d5bf94db
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:40:18 2010 +0200
s3-build: only link in ntsvcs client code where needed.
Guenther
commit 1a00dd4aa7372e9ca9066b28f1ff7aaa7ce3d3a4
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:38:09 2010 +0200
s3-waf: only link in ntsvcs client code where needed.
Guenther
commit 50df1c6f8726f5f34c6031c70ae3df7026f949f4
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:35:24 2010 +0200
s3-build: only link in winreg client code where needed.
Guenther
commit ad855c0970c939da7bfe719a4707cf7f39eff330
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:31:40 2010 +0200
s3-waf: only link in winreg client code where needed.
Guenther
commit 2af95fc88b95e0c251ef6df8084ac55ad73ade1a
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:28:48 2010 +0200
s3-build: only link in eventlog client code where needed.
Guenther
commit dc663295d19357773a0c5d990f50be831a1e76e8
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:19:59 2010 +0200
s3-build: only link in spoolss client code where needed.
Shrinks a lot of binaries by 1 MB each.
Guenther
commit 72f30e82e406ae3690c0d324b844fc6b3a4c02c4
Author: Günther Deschner <[email protected]>
Date: Thu Aug 12 17:19:24 2010 +0200
s3-waf: only link in spoolss client code where needed.
Shrinks a lot of binaries by 1 MB each.
Guenther
commit e978a3d3f4974753f09fbafdd0cf3ad15209911f
Author: Günther Deschner <[email protected]>
Date: Thu Aug 19 23:15:22 2010 +0200
s3-lsa: separate out init_lsa headers.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 252 ++++++++++++++++++++------------
source3/include/proto.h | 7 -
source3/lib/netapi/group.c | 1 +
source3/lib/netapi/localgroup.c | 1 +
source3/lib/netapi/samr.c | 1 +
source3/lib/netapi/shutdown.c | 1 +
source3/lib/netapi/user.c | 1 +
source3/libnet/libnet_join.c | 1 +
source3/rpc_client/cli_lsarpc.c | 1 +
source3/rpc_client/cli_pipe.c | 200 -------------------------
source3/rpc_client/cli_pipe_schannel.c | 228 +++++++++++++++++++++++++++++
source3/rpc_client/cli_samr.c | 1 +
source3/rpc_client/init_lsa.c | 1 +
source3/rpc_client/init_lsa.h | 6 +
source3/rpc_server/srv_lsa_nt.c | 1 +
source3/rpc_server/srv_netlog_nt.c | 1 +
source3/rpc_server/srv_samr_nt.c | 1 +
source3/rpcclient/cmd_eventlog.c | 1 +
source3/rpcclient/cmd_lsarpc.c | 1 +
source3/rpcclient/cmd_samr.c | 1 +
source3/smbd/lanman.c | 1 +
source3/utils/net_rpc.c | 1 +
source3/utils/net_rpc_join.c | 1 +
source3/utils/net_rpc_rights.c | 1 +
source3/wscript_build | 180 ++++++++++++++---------
25 files changed, 524 insertions(+), 368 deletions(-)
create mode 100644 source3/rpc_client/cli_pipe_schannel.c
create mode 100644 source3/rpc_client/init_lsa.h
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index d80c6c7..04c62d3 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -337,6 +337,60 @@ LIBNDR_PREG_OBJ = librpc/gen_ndr/ndr_preg.o \
LIBNDR_XATTR_OBJ = librpc/gen_ndr/ndr_xattr.o \
../librpc/ndr/ndr_xattr.o
+LIBCLI_SPOOLSS_OBJ = librpc/gen_ndr/cli_spoolss.o \
+ librpc/gen_ndr/ndr_spoolss_c.o \
+ rpc_client/cli_spoolss.o \
+ rpc_client/init_spoolss.o
+
+LIBCLI_EVENTLOG_OBJ = librpc/gen_ndr/cli_eventlog.o \
+ librpc/gen_ndr/ndr_eventlog_c.o
+
+LIBCLI_WINREG_OBJ = librpc/gen_ndr/cli_winreg.o \
+ librpc/gen_ndr/ndr_winreg_c.o
+
+LIBCLI_NTSVCS_OBJ = librpc/gen_ndr/cli_ntsvcs.o \
+ librpc/gen_ndr/ndr_ntsvcs_c.o
+
+LIBCLI_DRSUAPI_OBJ = librpc/gen_ndr/cli_drsuapi.o \
+ librpc/gen_ndr/ndr_drsuapi_c.o
+
+LIBCLI_DFS_OBJ = librpc/gen_ndr/cli_dfs.o \
+ librpc/gen_ndr/ndr_dfs_c.o
+
+LIBCLI_ECHO_OBJ = librpc/gen_ndr/cli_echo.o \
+ librpc/gen_ndr/ndr_echo_c.o
+
+LIBCLI_INITSHUTDOWN_OBJ = librpc/gen_ndr/cli_initshutdown.o \
+ librpc/gen_ndr/ndr_initshutdown_c.o
+
+LIBCLI_DSSETUP_OBJ = librpc/gen_ndr/cli_dssetup.o \
+ librpc/gen_ndr/ndr_dssetup_c.o
+
+LIBCLI_SVCCTL_OBJ = librpc/gen_ndr/cli_svcctl.o \
+ librpc/gen_ndr/ndr_svcctl_c.o
+
+LIBCLI_WKSSVC_OBJ = librpc/gen_ndr/cli_wkssvc.o \
+ librpc/gen_ndr/ndr_wkssvc_c.o
+
+LIBCLI_SRVSVC_OBJ = librpc/gen_ndr/cli_srvsvc.o \
+ librpc/gen_ndr/ndr_srvsvc_c.o
+
+LIBCLI_LSA_OBJ = librpc/gen_ndr/cli_lsa.o \
+ librpc/gen_ndr/ndr_lsa_c.o \
+ rpc_client/cli_lsarpc.o \
+ rpc_client/init_lsa.o
+
+LIBCLI_SAMR_OBJ = librpc/gen_ndr/cli_samr.o \
+ librpc/gen_ndr/ndr_samr_c.o \
+ rpc_client/cli_samr.o
+
+LIBCLI_NETLOGON_OBJ = librpc/gen_ndr/cli_netlogon.o \
+ librpc/gen_ndr/ndr_netlogon_c.o \
+ rpc_client/cli_netlogon.o
+
+LIBCLI_EPMAPPER_OBJ = librpc/gen_ndr/cli_epmapper.o \
+ librpc/gen_ndr/ndr_epmapper_c.o
+
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
librpc/gen_ndr/ndr_dfs.o \
@@ -358,9 +412,6 @@ LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
# that requires knowledge of security contexts
REG_PARSE_PRS_OBJ = registry/reg_parse_prs.o
-RPC_PARSE_OBJ = rpc_client/init_netlogon.o \
- rpc_client/init_lsa.o
-
LIBREPLACE_OBJ = @LIBREPLACE_OBJS@
SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
@@ -544,55 +595,19 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o
libsmb/clifile.o \
$(CLDAP_OBJ) \
$(DRSUAPI_OBJ)
-RPC_CLIENT_OBJ1 = rpc_client/cli_netlogon.o \
- $(SCHANNEL_OBJ)
-
-LIBMSRPC_OBJ = rpc_client/cli_lsarpc.o rpc_client/cli_samr.o \
- $(RPC_CLIENT_OBJ1) \
- $(RPC_CLIENT_OBJ) \
- rpc_client/cli_spoolss.o \
- rpc_client/init_spoolss.o \
- rpc_client/init_samr.o \
- ../librpc/rpc/binding.o
-
-DCERPC_CLIENT_GEN_OBJ = \
- librpc/gen_ndr/ndr_lsa_c.o \
- librpc/gen_ndr/ndr_dfs_c.o \
- librpc/gen_ndr/ndr_echo_c.o \
- librpc/gen_ndr/ndr_srvsvc_c.o \
- librpc/gen_ndr/ndr_svcctl_c.o \
- librpc/gen_ndr/ndr_winreg_c.o \
- librpc/gen_ndr/ndr_initshutdown_c.o \
- librpc/gen_ndr/ndr_eventlog_c.o \
- librpc/gen_ndr/ndr_wkssvc_c.o \
- librpc/gen_ndr/ndr_netlogon_c.o \
- librpc/gen_ndr/ndr_samr_c.o \
- librpc/gen_ndr/ndr_dssetup_c.o \
- librpc/gen_ndr/ndr_ntsvcs_c.o \
- librpc/gen_ndr/ndr_epmapper_c.o \
- librpc/gen_ndr/ndr_drsuapi_c.o \
- librpc/gen_ndr/ndr_spoolss_c.o
-
-LIBMSRPC_GEN_OBJ = librpc/gen_ndr/cli_lsa.o \
- librpc/gen_ndr/cli_dfs.o \
- librpc/gen_ndr/cli_echo.o \
- librpc/gen_ndr/cli_srvsvc.o \
- librpc/gen_ndr/cli_svcctl.o \
- librpc/gen_ndr/cli_winreg.o \
- librpc/gen_ndr/cli_initshutdown.o \
- librpc/gen_ndr/cli_eventlog.o \
- librpc/gen_ndr/cli_wkssvc.o \
- librpc/gen_ndr/cli_netlogon.o \
- librpc/gen_ndr/cli_samr.o \
- librpc/gen_ndr/cli_dssetup.o \
- librpc/gen_ndr/cli_ntsvcs.o \
- librpc/gen_ndr/cli_epmapper.o \
- librpc/gen_ndr/cli_drsuapi.o \
- librpc/gen_ndr/cli_spoolss.o \
- $(DCERPC_CLIENT_GEN_OBJ) \
- ../librpc/rpc/dcerpc_util.o \
- ../librpc/rpc/binding_handle.o \
- librpc/rpc/dcerpc_helpers.o \
+LIBMSRPC_OBJ = $(SCHANNEL_OBJ) \
+ rpc_client/cli_pipe.o \
+ librpc/rpc/dcerpc_gssapi.o \
+ librpc/rpc/dcerpc_spnego.o \
+ librpc/rpc/rpc_common.o \
+ rpc_client/rpc_transport_np.o \
+ rpc_client/rpc_transport_sock.o \
+ ../librpc/rpc/binding.o \
+ ../librpc/rpc/dcerpc_util.o \
+ ../librpc/rpc/binding_handle.o \
+ librpc/rpc/dcerpc_helpers.o
+
+LIBMSRPC_GEN_OBJ = $(LIBCLI_EPMAPPER_OBJ) \
$(LIBNDR_GEN_OBJ)
#
@@ -696,14 +711,18 @@ RPC_PIPE_OBJ = rpc_server/srv_pipe.o
rpc_server/srv_pipe_hnd.o \
RPC_ECHO_OBJ = rpc_server/srv_echo_nt.o librpc/gen_ndr/srv_echo.o
-RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ)
+RPC_SERVER_OBJ = @RPC_STATIC@ $(RPC_PIPE_OBJ) $(NPA_TSTREAM_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_WINREG_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+ $(LIBCLI_LSA_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ $(LIBCLI_NETLOGON_OBJ) \
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
-RPC_CLIENT_OBJ = rpc_client/cli_pipe.o \
- librpc/rpc/dcerpc_gssapi.o \
- librpc/rpc/dcerpc_spnego.o \
- librpc/rpc/rpc_common.o \
- rpc_client/rpc_transport_np.o \
- rpc_client/rpc_transport_sock.o
+RPC_CLIENT_SCHANNEL_OBJ = rpc_client/cli_pipe_schannel.o
LOCKING_OBJ = locking/locking.o locking/brlock.o locking/posix.o
@@ -868,7 +887,7 @@ SMBD_OBJ_SRV = smbd/server_reload.o \
$(MANGLE_OBJ) @VFS_STATIC@
SMBD_OBJ_BASE = $(PARAM_WITHOUT_REG_OBJ) $(SMBD_OBJ_SRV) $(LIBSMB_OBJ) \
- $(RPC_SERVER_OBJ) $(RPC_PARSE_OBJ) \
+ $(RPC_SERVER_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(PRINTING_OBJ) $(PROFILE_OBJ) \
$(LIB_OBJ) $(PRINTBACKEND_OBJ) $(OPLOCK_OBJ) \
$(NOTIFY_OBJ) $(FNAME_UTIL_OBJ) $(GROUPDB_OBJ) $(AUTH_OBJ) \
@@ -919,8 +938,10 @@ SWAT_OBJ1 = web/cgi.o web/diagnose.o web/startstop.o
web/statuspage.o \
SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(PRINTING_OBJ) $(PRINTBASE_OBJ)
$(LIBSMB_OBJ) \
$(LOCKING_OBJ) $(PASSDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIB_NONSMBD_OBJ) $(GROUPDB_OBJ) $(PLAINTEXT_AUTH_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) $(LIBMSRPC_GEN_OBJ)
$(LIBMSRPC_OBJ) \
- $(PASSCHANGE_OBJ) $(FNAME_UTIL_OBJ)
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(PASSCHANGE_OBJ) $(FNAME_UTIL_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ rpc_client/init_lsa.o
STATUS_OBJ = utils/status.o utils/status_profile.o \
$(LOCKING_OBJ) $(PARAM_OBJ) \
@@ -933,10 +954,10 @@ SMBCONTROL_OBJ = utils/smbcontrol.o $(PARAM_OBJ)
$(LIB_NONSMBD_OBJ) \
SMBTREE_OBJ = utils/smbtree.o $(PARAM_OBJ) \
$(PROFILE_OBJ) $(LIB_NONSMBD_OBJ) $(LIBSMB_OBJ) \
$(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
- $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o $(RPC_PARSE_OBJ) \
- $(RPC_CLIENT_OBJ1) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
- $(LIBMSRPC_GEN_OBJ)
+ $(LIBMSRPC_GEN_OBJ) \
+ $(LIBMSRPC_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ)
TESTPARM_OBJ = utils/testparm.o \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) \
@@ -955,8 +976,10 @@ PASSWD_UTIL_OBJ = utils/passwd_util.o
SMBPASSWD_OBJ = utils/smbpasswd.o $(PASSWD_UTIL_OBJ) $(PASSCHANGE_OBJ) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(PASSDB_OBJ) \
$(GROUPDB_OBJ) $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(RPC_PARSE_OBJ) \
- $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ)
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+ $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ rpc_client/init_lsa.o
PDBEDIT_OBJ = utils/pdbedit.o $(PASSWD_UTIL_OBJ) $(PARAM_OBJ) $(PASSDB_OBJ) \
$(LIBSAMBA_OBJ) $(LIBTSOCKET_OBJ) \
@@ -979,10 +1002,25 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o
rpcclient/cmd_lsarpc.o \
RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \
$(PARAM_OBJ) $(LIBSMB_OBJ) $(LIB_NONSMBD_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ)
$(LIBMSRPC_OBJ) \
+ $(PASSDB_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
$(READLINE_OBJ) $(GROUPDB_OBJ) $(KRBCLIENT_OBJ) \
$(LIBADS_OBJ) $(POPT_LIB_OBJ) \
- $(SMBLDAP_OBJ) $(DCUTIL_OBJ)
+ $(SMBLDAP_OBJ) $(DCUTIL_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_EVENTLOG_OBJ) \
+ $(LIBCLI_NTSVCS_OBJ) \
+ $(LIBCLI_DRSUAPI_OBJ) \
+ $(LIBCLI_DFS_OBJ) \
+ $(LIBCLI_ECHO_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ) \
+ $(LIBCLI_WKSSVC_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+ $(LIBCLI_LSA_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ $(LIBCLI_NETLOGON_OBJ) \
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
PAM_WINBIND_OBJ = ../nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
$(LIBREPLACE_OBJ) @BUILD_INIPARSER@
@@ -1008,8 +1046,10 @@ LIBSMBCLIENT_OBJ0 = \
LIBSMBCLIENT_OBJ1 = $(LIBSMBCLIENT_OBJ0) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+ $(LIBCLI_LSA_OBJ)
LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
@@ -1020,20 +1060,19 @@ LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1)
LIBBIGBALLOFMUD_MAJOR = 0
LIBBIGBALLOFMUD_OBJ = $(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ)
$(PASSDB_OBJ) \
+ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(PASSDB_OBJ) \
$(GROUPDB_OBJ) $(KRBCLIENT_OBJ) $(SMBLDAP_OBJ)
-CLIENT_OBJ1 = client/client.o client/clitar.o $(RPC_CLIENT_OBJ) \
- ../librpc/rpc/binding.o \
+CLIENT_OBJ1 = client/client.o client/clitar.o \
client/dnsbrowse.o \
- $(RPC_CLIENT_OBJ1) \
- $(RPC_PARSE_OBJ)
+ $(LIBMSRPC_OBJ)
CLIENT_OBJ = $(CLIENT_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
$(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(READLINE_OBJ) $(POPT_LIB_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
- $(DISPLAY_SEC_OBJ)
+ $(DISPLAY_SEC_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ)
LIBSMBCONF_OBJ = ../lib/smbconf/smbconf.o \
../lib/smbconf/smbconf_util.o \
@@ -1081,7 +1120,21 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
utils/net_eventlog.o \
utils/net_printing.o \
$(LIBNDR_NTPRINTING_OBJ) \
- $(LIBNDR_PREG_OBJ)
+ $(LIBNDR_PREG_OBJ) \
+ $(LIBCLI_SPOOLSS_OBJ) \
+ $(LIBCLI_WINREG_OBJ) \
+ $(LIBCLI_DRSUAPI_OBJ) \
+ $(LIBCLI_INITSHUTDOWN_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ) \
+ $(LIBCLI_SVCCTL_OBJ) \
+ $(LIBCLI_WKSSVC_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+ $(LIBCLI_LSA_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ $(LIBCLI_NETLOGON_OBJ) \
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
# these are not processed by make proto
@@ -1090,7 +1143,7 @@ NET_OBJ2 = utils/net_registry_util.o
utils/net_help_common.o
NET_OBJ = $(NET_OBJ1) \
$(NET_OBJ2) @fake_kaserver_...@\
$(PARAM_WITHOUT_REG_OBJ) $(LIBSMB_OBJ) \
- $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
+ $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(LIBADS_PRINTER_OBJ)
$(POPT_LIB_OBJ) \
@@ -1152,15 +1205,17 @@ LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ)
$(LOCKING_OBJ) $(LIBSMB_OBJ) \
$(LIBNDR_GEN_OBJ0) $(FNAME_UTIL_OBJ)
SMBCACLS_OBJ = utils/smbcacls.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
- $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
+ $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) \
$(PASSDB_OBJ) $(GROUPDB_OBJ) $(LIBMSRPC_OBJ)
$(LIBMSRPC_GEN_OBJ) \
- $(POPT_LIB_OBJ) $(SMBLDAP_OBJ)
+ $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) \
+ $(LIBCLI_LSA_OBJ)
SMBCQUOTAS_OBJ = utils/smbcquotas.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
$(PARAM_OBJ) \
- $(LIB_NONSMBD_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIB_NONSMBD_OBJ) \
$(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(POPT_LIB_OBJ) \
- $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ)
+ $(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
+ $(LIBCLI_LSA_OBJ)
EVTLOGADM_OBJ0 = utils/eventlogadm.o
@@ -1318,14 +1373,20 @@ WINBINDD_OBJ1 = \
WINBINDD_OBJ = \
$(WINBINDD_OBJ1) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) \
- $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ)
$(RPC_PARSE_OBJ) \
+ $(LIBSMB_OBJ) $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(PROFILE_OBJ) $(SLCACHE_OBJ) $(SMBLDAP_OBJ) \
$(LIBADS_OBJ) $(KRBCLIENT_OBJ) $(POPT_LIB_OBJ) \
$(DCUTIL_OBJ) $(IDMAP_OBJ) $(NSS_INFO_OBJ) \
$(RPC_NCACN_NP_INTERNAL) $(RPC_SAMR_OBJ) $(RPC_LSA_OBJ) \
$(AFS_OBJ) $(AFS_SETTOKEN_OBJ) \
$(LIBADS_SERVER_OBJ) \
- $(TDB_VALIDATE_OBJ)
+ $(TDB_VALIDATE_OBJ) \
+ $(LIBCLI_DSSETUP_OBJ) \
+ $(LIBCLI_LSA_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ $(LIBCLI_NETLOGON_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
WBINFO_OBJ = ../nsswitch/wbinfo.o $(LIBSAMBA_OBJ) $(PARAM_OBJ)
$(LIB_NONSMBD_OBJ) \
$(POPT_LIB_OBJ) $(AFS_SETTOKEN_OBJ) \
@@ -1378,13 +1439,7 @@ RPC_OPEN_TCP_OBJ = torture/rpc_open_tcp.o \
$(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(LIB_NONSMBD_OBJ) \
$(KRBCLIENT_OBJ) \
- $(RPC_PARSE_OBJ) \
- $(RPC_CLIENT_OBJ1) \
- librpc/rpc/rpc_common.o \
- rpc_client/cli_pipe.o \
- librpc/rpc/dcerpc_gssapi.o \
- librpc/rpc/dcerpc_spnego.o \
- ../librpc/rpc/binding.o \
+ $(LIBMSRPC_OBJ) \
$(LIBMSRPC_GEN_OBJ)
DBWRAP_TOOL_OBJ = utils/dbwrap_tool.o \
@@ -2238,10 +2293,19 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
$(REG_SMBCONF_OBJ) \
$(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
$(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
- $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+ $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) \
$(PASSDB_OBJ) $(SMBLDAP_OBJ) $(GROUPDB_OBJ) \
$(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ) \
- auth/token_util.o
+ auth/token_util.o \
+ $(LIBCLI_INITSHUTDOWN_OBJ) \
+ $(LIBCLI_WKSSVC_OBJ) \
+ $(LIBCLI_SRVSVC_OBJ) \
+ $(LIBCLI_LSA_OBJ) \
+ $(LIBCLI_SAMR_OBJ) \
+ $(LIBCLI_NETLOGON_OBJ) \
+ $(RPC_CLIENT_SCHANNEL_OBJ) \
+ rpc_client/init_netlogon.o \
+ rpc_client/init_samr.o
libnetapi_shared_targ...@libnetapi_shared_target@
libnetapi_sov...@libnetapi_sover@
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 67718a9..c1e4718 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 b8aa418..53114b5 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 f883232..03a7a71 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 a33be2a..fb8e163 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 4c274d6..4bbb99e 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 7107b32..67a7443 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 7d83dc3..349ef55 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 72514e7..823bdfa 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"
--
Samba Shared Repository
