s3compat: cleanup duplicate var declarations

diff --git a/source4/s3compat/wscript_build b/source4/s3compat/wscript_build
index 416d08fe4afe90d96df4a3c0e9d17967f40ce0f6..6bbdc7a8defde52306431cb6d3adfd27ab972586 100644 (file)
--- a/source4/s3compat/wscript_build
+++ b/source4/s3compat/wscript_build
@@ -93,16 +93,6 @@ RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
                  rpc_client/init_netlogon.c
                  rpc_client/init_lsa.c'''
 
-LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-
-SOCKET_WRAPPER_SRC = '''${SOCKET_WRAPPER_SRCS}'''
-NSS_WRAPPER_SRC = '''${NSS_WRAPPER_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''
-                ${LIBREPLACE_SRC}
-                ${SOCKET_WRAPPER_SRC}
-                ${NSS_WRAPPER_SRC}'''
-
 UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
                    ../lib/util/xfile.c ../lib/util/util_strlist.c
                    ../lib/util/util_file.c ../lib/util/data_blob.c
@@ -132,15 +122,9 @@ SMBLDAP = 'lib/smbldap.c'
 
 SMBLDAPUTIL = ''
 
-LIBREPLACE_SRCS = ''
-
-SOCKET_WRAPPER_SRCS = ''
-
-NSS_WRAPPER_SRCS = ''
-
 ZLIB_SRCS = ''
 
-LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${CRYPTO_SRC}
+LIB_SRC = '''${CRYPTO_SRC}
           lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
@@ -192,7 +176,7 @@ KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
 
 LIBADDNS_SRC0 = '''libaddns/dnsrecord.c libaddns/dnsutils.c  libaddns/dnssock.c
                libaddns/dnsgss.c libaddns/dnsmarshall.c'''
-LIBADDNS_SRC = '''${LIBADDNS_SRC0} ${SOCKET_WRAPPER_SRC}'''
+LIBADDNS_SRC = '''${LIBADDNS_SRC0}'''
 
 GPEXT_SRC = '''../libgpo/gpext/gpext.c ${GPEXT_STATIC}'''
 
@@ -310,7 +294,7 @@ LIBMSRPC_GEN_SRC = '''../librpc/gen_ndr/cli_lsa.c
 #
 # registry-related objects
 #
-UTIL_REG_SRC = '''lib/util_reg.c'''
+UTIL_REG_SRC = '''../libcli/registry/util_reg.c'''
 UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
 
 REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
@@ -668,27 +652,6 @@ SMBD_SRC_MAIN = '''smbd/server.c'''
 
 BUILDOPT_SRC = '''smbd/build_options.c'''
 
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c param/util.c lib/sharesec.c lib/ldap_debug_handler.c'''
-
-PRIVILEGES_BASIC_SRC = '''lib/privileges_basic.c'''
-
-UTIL_SRC = '''../lib/util/rbtree.c ../lib/util/signal.c ../lib/util/time.c
-                  ../lib/util/xfile.c ../lib/util/util_strlist.c
-                  ../lib/util/util_file.c ../lib/util/data_blob.c
-                  ../lib/util/util.c ../lib/util/fsusage.c
-                  ../lib/util/params.c ../lib/util/talloc_stack.c
-                  ../lib/util/genrand.c ../lib/util/util_net.c
-                  ../lib/util/become_daemon.c ../lib/util/system.c
-                  ../lib/util/tevent_unix.c ../lib/util/tevent_ntstatus.c
-                  ../lib/util/smb_threads.c ../lib/util/util_id.c
-                  ../lib/util/blocking.c ../lib/util/rfc1738.c '''
-
-CRYPTO_SRC = '''../lib/crypto/crc32.c ../lib/crypto/md5.c
-                        ../lib/crypto/hmacmd5.c ../lib/crypto/arcfour.c
-                        ../lib/crypto/md4.c
-                        ../lib/crypto/sha256.c ../lib/crypto/hmacsha256.c
-                        ../lib/crypto/aes.c ../lib/crypto/rijndael-alg-fst.c'''
-
 TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
          lib/dbwrap.c lib/dbwrap_tdb.c
          lib/dbwrap_ctdb.c
@@ -697,51 +660,10 @@ TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
 
 TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
 
-VERSION_SRC = '''lib/version.c'''
-
-UTIL_REG_SRC = '''lib/util_reg.c'''
-UTIL_REG_API_SRC = '''lib/util_reg_api.c'''
-
-LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
-            ../librpc/ndr/ndr.c
-            ../librpc/ndr/ndr_misc.c
-            ../librpc/gen_ndr/ndr_misc.c
-            ../librpc/gen_ndr/ndr_security.c
-            ../librpc/ndr/ndr_sec_helper.c
-            librpc/ndr/ndr_string.c
-            ../librpc/ndr/uuid.c
-            librpc/ndr/util.c
-            ../librpc/gen_ndr/ndr_dcerpc.c'''
-
-REGFIO_SRC = '''registry/regfio.c'''
-
 REGSRCS_SRC = '''registry/reg_objects.c'''
 
-REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c'''
-REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
-REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-
-RPC_PARSE_SRC0 = '''rpc_parse/parse_prs.c rpc_parse/parse_misc.c'''
-
-# this includes only the low level parse code, not stuff
-# that requires knowledge of security contexts
-RPC_PARSE_SRC1 = '''${RPC_PARSE_SRC0}'''
-
-RPC_PARSE_SRC2 = '''rpc_parse/parse_rpc.c
-                rpc_client/init_netlogon.c
-                rpc_client/init_lsa.c'''
-
-RPC_PARSE_SRC = '''${RPC_PARSE_SRC2}'''
-
-NTERR_SRC = '''libsmb/nterr.c libsmb/smberr.c'''
-DOSERR_SRC = '../libcli/util/doserr.c'
-ERRORMAP_SRC = 'libsmb/errormap.c'
-DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
-
 LIBSMB_ERR_SRC0 = '''${NTERR_SRC} ${ERRORMAP_SRC} ${DCE_RPC_ERR_SRC}'''
 
-LIBSMB_ERR_SRC1 = '''../libcli/auth/smbdes.c ../libcli/auth/smbencrypt.c ../libcli/auth/msrpc_parse.c ../libcli/auth/session.c'''
-
 LIBSMB_ERR_SRC = '''${LIBSMB_ERR_SRC0} ${LIBSMB_ERR_SRC1}
                 ${RPC_PARSE_SRC1}'''