[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  f3561e5 s3-waf: add missing idmap module objectfiles.
       via  f2316f8 s3-waf: convert DISPLAY_SEC into a subsystem.
      from  5d54dc2 s3-waf: fix libnetapi and libaddns unresolved symbols.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f3561e5cfc0779f7b60bbe99887d505c05502232
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 24 23:37:43 2010 -0700

    s3-waf: add missing idmap module objectfiles.
    
    Guenther

commit f2316f86fa6db6dcba9220e017ce32bb176b15e7
Author: Günther Deschner <gd at samba.org>
Date:   Fri Sep 24 22:14:22 2010 -0700

    s3-waf: convert DISPLAY_SEC into a subsystem.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/wscript_build |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index c8c3b80..1e9ae49 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -605,6 +605,12 @@ NSS_INFO_STATIC = ''
 NSS_INFO_TEMPLATE_SRC = 'winbindd/nss_info_template.c'
 NSS_INFO_SRC = 'winbindd/nss_info.c'
 
+IDMAP_AD_SRC = '''winbindd/idmap_ad.c'''
+IDMAP_RID_SRC = '''winbindd/idmap_rid.c'''
+IDMAP_PASSDB_SRC = '''winbindd/idmap_passdb.c'''
+IDMAP_LDAP_SRC = '''winbindd/idmap_ldap.c'''
+IDMAP_TDB2_SRC = '''winbindd/idmap_tdb2.c'''
+
 IDMAP_HASH_SRC = '''winbindd/idmap_hash/idmap_hash.c
                     winbindd/idmap_hash/mapfile.c'''
 
@@ -870,8 +876,7 @@ RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
                     rpcclient/cmd_shutdown.c rpcclient/cmd_test.c
                     rpcclient/cmd_wkssvc.c rpcclient/cmd_ntsvcs.c
                     rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
-                    rpcclient/cmd_winreg.c
-                    ${DISPLAY_SEC_SRC}'''
+                    rpcclient/cmd_winreg.c'''
 
 RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}
                    ${DCUTIL_SRC}
@@ -958,7 +963,6 @@ CLIENT_SRC1 = '''client/client.c client/clitar.c
                  client/dnsbrowse.c'''
 
 CLIENT_SRC = '''${CLIENT_SRC1}
-                ${DISPLAY_SEC_SRC}
                 ${LIBCLI_SRVSVC_SRC}
                 rpc_client/init_lsa.c'''
 
@@ -1025,7 +1029,7 @@ NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
 NET_SRC = '''${NET_SRC1}
              ${NET_SRC2}
              ${DCUTIL_SRC}
-             ${LIBGPO_SRC} ${DISPLAY_SEC_SRC}
+             ${LIBGPO_SRC}
              ${REGFIO_SRC}'''
 
 CUPS_SRC = '''client/smbspool.c'''
@@ -1349,6 +1353,10 @@ bld.SAMBA_SUBSYSTEM('PASSWD_UTIL',
                     source=PASSWD_UTIL_SRC,
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('DISPLAY_SEC',
+                    source=DISPLAY_SEC_SRC,
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('LIBNET',
                     source=LIBNET_SRC,
                     deps='NDR_LIBNET_JOIN',
@@ -1451,14 +1459,14 @@ bld.SAMBA_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC
-                 LIBADS READLINE''',
+                 LIBADS READLINE DISPLAY_SEC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('smbclient',
                  source=CLIENT_SRC,
                  deps='''talloc tdb cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN
-                 LIBMSRPC READLINE''',
+                 LIBMSRPC READLINE DISPLAY_SEC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('net',
@@ -1466,7 +1474,7 @@ bld.SAMBA_BINARY('net',
                  deps='''talloc tdb libnetapi libaddns cap resolv POPT_SAMBA PASSDB LIBSMB LIB_NONSMBD
                  PARAM_WITHOUT_REG libwbclient PARAM KRBCLIENT LIBMSRPC_GEN LIBMSRPC LIBADS LIBADS_SERVER LIBADS_PRINTER
                  LOCALE_DIR LIBAFS LIBAFS_SETTOKEN READLINE PASSWD_UTIL LIBNET
-                 LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG''',
+                 LIBNET_DSSYNC LIBNET_SAMSYNC LIBEVENTLOG DISPLAY_SEC''',
                  vars=locals())
 
 bld.SAMBA_BINARY('profiles',


-- 
Samba Shared Repository