s3-waf: only link in netlogon client code where needed.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index ed47f3642e2f3bc03e1a0543511f07001a7fa864..9488e23728206c97be4dbb2770a5cc90c868a4cb 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -129,6 +129,11 @@ LIBCLI_SAMR_SRC = '''
                   librpc/gen_ndr/ndr_samr_c.c
                   rpc_client/cli_samr.c'''
 
+LIBCLI_NETLOGON_SRC = '''
+                      librpc/gen_ndr/cli_netlogon.c
+                      librpc/gen_ndr/ndr_netlogon_c.c
+                      rpc_client/cli_netlogon.c'''
+
 LIBNDR_GEN_SRC = '''../librpc/gen_ndr/ndr_wkssvc.c
                  ${LIBNDR_GEN_SRC0}
                  ../librpc/gen_ndr/ndr_dfs.c
@@ -342,8 +347,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
              ${CLDAP_SRC}
              ${DRSUAPI_SRC}'''
 
-RPC_CLIENT_SRC1 = '''rpc_client/cli_netlogon.c
-                  ${SCHANNEL_SRC}'''
+RPC_CLIENT_SRC1 = '''${SCHANNEL_SRC}'''
 
 LIBMSRPC_SRC = '''
                ${RPC_CLIENT_SRC1}
@@ -352,11 +356,9 @@ LIBMSRPC_SRC = '''
                    ../librpc/rpc/binding.c'''
 
 DCERPC_CLIENT_GEN_SRC = '''
-                ../librpc/gen_ndr/ndr_netlogon_c.c
                 ../librpc/gen_ndr/ndr_epmapper_c.c'''
 
 LIBMSRPC_GEN_SRC = '''
-                   ../librpc/gen_ndr/cli_netlogon.c
                    ../librpc/gen_ndr/cli_epmapper.c
                    ${DCERPC_CLIENT_GEN_SRC}
                    ../librpc/rpc/dcerpc_util.c
@@ -728,7 +730,8 @@ WINBINDD_SRC = '''${WINBINDD_SRC1}
                   ${TDB_VALIDATE_SRC}
                   ${LIBCLI_DSSETUP_SRC}
                   ${LIBCLI_LSA_SRC}
-                  ${LIBCLI_SAMR_SRC}'''
+                  ${LIBCLI_SAMR_SRC}
+                  ${LIBCLI_NETLOGON_SRC}'''
 
 LIBNET_SRC = 'libnet/libnet_join.c libnet/libnet_keytab.c librpc/gen_ndr/ndr_libnet_join.c'
 
@@ -807,6 +810,7 @@ SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
                 ${LIBCLI_SRVSVC_SRC}
                 ${LIBCLI_LSA_SRC}
                 ${LIBCLI_SAMR_SRC}
+                ${LIBCLI_NETLOGON_SRC}
                 ${RPC_CLIENT_SCHANNEL_SRC}
                 ${AUTH_SRC}
                 ${PRIVILEGES_BASIC_SRC}'''