s3-waf: convert TOKEN_UTIL into a subsystem.

Guenther

diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index 0fd28bc1f68e944ba05934013df2980c454871da..e740f8776604090fdf65dd289af48fc913b08c56 100644 (file)
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -10,7 +10,7 @@ AUTH_WBC_SRC = 'auth_wbc.c'
 AUTH_SCRIPT_SRC = 'auth_script.c'
 AUTH_NETLOGOND_SRC = 'auth_netlogond.c'
 
-AUTH_SRC = '''auth.c auth_util.c token_util.c
+AUTH_SRC = '''auth.c auth_util.c
            server_info.c
            server_info_sam.c
            user_info.c
@@ -18,9 +18,13 @@ AUTH_SRC = '''auth.c auth_util.c token_util.c
            user_krb5.c
            auth_compat.c auth_ntlmssp.c'''
 
+bld.SAMBA_SUBSYSTEM('TOKEN_UTIL',
+                    source='token_util.c',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('auth',
                     source=AUTH_SRC,
-                    deps='''PLAINTEXT_AUTH SLCACHE DCUTIL''',
+                    deps='''PLAINTEXT_AUTH SLCACHE DCUTIL TOKEN_UTIL''',
                     vars=locals())
 
 bld.SAMBA_MODULE('auth_sam',

diff --git a/source3/wscript_build b/source3/wscript_build
index 89f16c46422991274abcbcccdb16e34cf1957c6e..55782bc97eff2291fd0827c2e5b8c9588e5b5447 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -473,7 +473,6 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
                    winbindd/winbindd_pam_auth_crap.c
                    winbindd/winbindd_pam_chng_pswd_auth_crap.c
                    auth/auth_util.c
-                   auth/token_util.c
                    auth/user_util.c
                    auth/check_samsec.c
                    auth/server_info.c
@@ -688,7 +687,6 @@ LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/netlogon.c'''
 
 LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}
-                   auth/token_util.c
                    ${LIBCLI_INITSHUTDOWN_SRC}
                    ${LIBCLI_WKSSVC_SRC}
                    ${LIBCLI_SRVSVC_SRC}
@@ -740,7 +738,7 @@ NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
               utils/net_dns.c utils/net_ads_gpo.c
               utils/net_conf.c utils/net_join.c utils/net_user.c
               utils/net_group.c utils/net_file.c utils/net_registry.c
-              auth/token_util.c utils/net_dom.c utils/net_share.c
+              utils/net_dom.c utils/net_share.c
               utils/net_g_lock.c
               utils/net_serverid.c
               utils/net_eventlog.c
@@ -900,7 +898,7 @@ bld.SAMBA_LIBRARY('libnetapi',
                     public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
                     LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI
-                    RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF''',
+                    RPC_CLIENT_SCHANNEL LIBSMBCONF REG_SMBCONF TOKEN_UTIL''',
                     public_headers='lib/netapi/netapi.h',
                     private_library=True,
                     vars=locals())
@@ -1233,6 +1231,7 @@ bld.SAMBA_BINARY('winbindd/winbindd',
                  POPT_SAMBA KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER
                  SRV_NDR_WBINT RPCCLI_NDR_WBINT LIBAFS
                  LIBAFS_SETTOKEN PROFILE SLCACHE DCUTIL idmap nss_info
+                 TOKEN_UTIL
                  ''',
                  enabled=bld.env.build_winbind,
                  install_path='${SBINDIR}',
@@ -1269,7 +1268,7 @@ bld.SAMBA_BINARY('net',
                  LOCALE_DIR LIBAFS LIBAFS_SETTOKEN SMBREADLINE PASSWD_UTIL LIBNET
                  LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DCUTIL
                  REGFIO NDR_NTPRINTING RPCCLI_WINREG
-                 RPC_CLIENT_SCHANNEL''',
+                 RPC_CLIENT_SCHANNEL TOKEN_UTIL''',
                  vars=locals())
 
 bld.SAMBA_BINARY('profiles',