Attachment 12697 Details for Bug 12450 – Proposed patch for master

[patch] Proposed patch for master

master_param_smbconf_smbregistry.patch (text/plain), 114.46 KB, created by Andreas Schneider on 2016-11-26 17:18:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Schneider

Created: 2016-11-26 17:18:09 UTC

Size: 114.46 KB

patch

obsolete

>From 93fa24024a1555341e7949666a2b764e082c43cd Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:23:06 +0100
>Subject: [PATCH 01/61] s3-waf: Reformat netapi
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 57 ++++++++++++++++++++++++++-------------------------
> 1 file changed, 29 insertions(+), 28 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index d6d2be2..80e10fc 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -22,35 +22,36 @@ bld.SETUP_BUILD_GROUPS()
> ######################## SUBSYSTEMS #################################
> 
> bld.SAMBA3_LIBRARY('netapi',
>-                    source='''lib/netapi/netapi.c
>-                    lib/netapi/cm.c
>-                    lib/netapi/libnetapi.c
>-                    lib/netapi/joindomain.c
>-                    lib/netapi/serverinfo.c
>-                    lib/netapi/wkstainfo.c
>-                    lib/netapi/getdc.c
>-                    lib/netapi/user.c
>-                    lib/netapi/group.c
>-                    lib/netapi/localgroup.c
>-                    lib/netapi/samr.c
>-                    lib/netapi/sid.c
>-                    lib/netapi/share.c
>-                    lib/netapi/file.c
>-                    lib/netapi/shutdown.c
>-                    lib/netapi/netlogon.c''',
>+                    source='''
>+                           lib/netapi/netapi.c
>+                           lib/netapi/cm.c
>+                           lib/netapi/libnetapi.c
>+                           lib/netapi/joindomain.c
>+                           lib/netapi/serverinfo.c
>+                           lib/netapi/wkstainfo.c
>+                           lib/netapi/getdc.c
>+                           lib/netapi/user.c
>+                           lib/netapi/group.c
>+                           lib/netapi/localgroup.c
>+                           lib/netapi/samr.c
>+                           lib/netapi/sid.c
>+                           lib/netapi/share.c
>+                           lib/netapi/file.c
>+                           lib/netapi/shutdown.c
>+                           lib/netapi/netlogon.c''',
>                     public_deps='''
>-                    talloc
>-                    util_cmdline
>-                    msrpc3
>-                    ads
>-                    NDR_LIBNETAPI
>-                    LIBNET
>-                    RPC_CLIENT_SCHANNEL
>-                    libcli_netlogon3
>-                    LIBCLI_SAMR
>-                    INIT_SAMR
>-                    auth
>-                    ''',
>+                                talloc
>+                                util_cmdline
>+                                msrpc3
>+                                ads
>+                                NDR_LIBNETAPI
>+                                LIBNET
>+                                RPC_CLIENT_SCHANNEL
>+                                libcli_netlogon3
>+                                LIBCLI_SAMR
>+                                INIT_SAMR
>+                                auth
>+                                ''',
>                     public_headers='../source3/lib/netapi/netapi.h',
>                     pc_files='libnet/netapi.pc',
>                     vnum='0')
>-- 
>2.10.2
>
>
>From bdb3a89c37c967f4eafee30d9ed9e20efa76e18f Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:24:14 +0100
>Subject: [PATCH 02/61] s3:waf: Reformat msrpc3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 29 ++++++++++++++++++++---------
> 1 file changed, 20 insertions(+), 9 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 80e10fc..a9ecc39 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -62,15 +62,26 @@ bld.SAMBA3_LIBRARY('gse',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('msrpc3',
>-                   source='''rpc_client/cli_pipe.c
>-                   rpc_client/rpc_transport_np.c
>-                   rpc_client/rpc_transport_sock.c
>-                   rpc_client/rpc_transport_tstream.c
>-                   librpc/rpc/dcerpc_helpers.c''',
>-                   deps='''ndr ndr-standard
>-                    RPC_NDR_EPMAPPER NTLMSSP_COMMON COMMON_SCHANNEL LIBCLI_AUTH
>-                    LIBTSOCKET gse dcerpc-binding
>-                    libsmb ndr-table NETLOGON_CREDS_CLI
>+                   source='''
>+                          rpc_client/cli_pipe.c
>+                          rpc_client/rpc_transport_np.c
>+                          rpc_client/rpc_transport_sock.c
>+                          rpc_client/rpc_transport_tstream.c
>+                          librpc/rpc/dcerpc_helpers.c
>+                          ''',
>+                   deps='''
>+                        ndr
>+                        ndr-standard
>+                        RPC_NDR_EPMAPPER
>+                        NTLMSSP_COMMON
>+                        COMMON_SCHANNEL
>+                        LIBCLI_AUTH
>+                        LIBTSOCKET
>+                        gse
>+                        dcerpc-binding
>+                        libsmb
>+                        ndr-table
>+                        NETLOGON_CREDS_CLI
>                    ''',
>                    private_library=True)
> 
>-- 
>2.10.2
>
>
>From 3531d7cd281a2ad30e6d4bbe587ca72a8938e5e7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:25:07 +0100
>Subject: [PATCH 03/61] s3:waf: Reformat gpo
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a9ecc39..a53a849 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -86,14 +86,22 @@ bld.SAMBA3_LIBRARY('msrpc3',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('gpo',
>-                   source='''../libgpo/gpo_ldap.c
>-                   ../libgpo/gpo_ini.c
>-                   ../libgpo/gpo_util.c
>-                   ../libgpo/gpo_fetch.c
>-                   libgpo/gpo_filesync.c
>-                   ../libgpo/gpo_sec.c
>-                   libgpo/gpo_reg.c''',
>-                   deps='talloc ads TOKEN_UTIL gpext auth',
>+                   source='''
>+                          ../libgpo/gpo_ldap.c
>+                          ../libgpo/gpo_ini.c
>+                          ../libgpo/gpo_util.c
>+                          ../libgpo/gpo_fetch.c
>+                          libgpo/gpo_filesync.c
>+                          ../libgpo/gpo_sec.c
>+                          libgpo/gpo_reg.c
>+                          ''',
>+                   deps='''
>+                        talloc
>+                        ads
>+                        TOKEN_UTIL
>+                        gpext
>+                        auth
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('AVAHI',
>-- 
>2.10.2
>
>
>From f12efb3ff045a88e8406f34dd3369f12dc40dc2a Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:26:08 +0100
>Subject: [PATCH 04/61] s3:waf: Reformat AVAHI
>
>---
> source3/wscript_build | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a53a849..83715bd 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -105,8 +105,14 @@ bld.SAMBA3_LIBRARY('gpo',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('AVAHI',
>-                    source='lib/avahi.c smbd/avahi_register.c',
>-                    deps='avahi-common avahi-client',
>+                    source='''
>+                           lib/avahi.c
>+                           smbd/avahi_register.c
>+                           ''',
>+                    deps='''
>+                         avahi-common
>+                         avahi-client
>+                         ''',
>                     enabled=bld.env.with_avahi)
> 
> bld.SAMBA3_SUBSYSTEM('GROUPDB',
>-- 
>2.10.2
>
>
>From e4dafb9f42d2374d0899b55592ecd48528ff9c89 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:26:39 +0100
>Subject: [PATCH 05/61] s3:waf: Reformat GROUPDB
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 83715bd..e38273b 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -116,7 +116,10 @@ bld.SAMBA3_SUBSYSTEM('AVAHI',
>                     enabled=bld.env.with_avahi)
> 
> bld.SAMBA3_SUBSYSTEM('GROUPDB',
>-                    source='groupdb/mapping.c groupdb/mapping_tdb.c',
>+                    source='''
>+                           groupdb/mapping.c
>+                           groupdb/mapping_tdb.c
>+                           ''',
>                     deps='tdb')
> 
> bld.SAMBA3_SUBSYSTEM('TLDAP',
>-- 
>2.10.2
>
>
>From 05a46476bc92126ba6f90067aea66fdd240b1765 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:27:33 +0100
>Subject: [PATCH 06/61] s3:waf: Reformat TLDAP
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 15 ++++++++++-----
> 1 file changed, 10 insertions(+), 5 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index e38273b..ea64cb4 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -123,11 +123,16 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
>                     deps='tdb')
> 
> bld.SAMBA3_SUBSYSTEM('TLDAP',
>-                    source='''lib/tldap.c
>-                    lib/tldap_util.c
>-                    lib/tldap_gensec_bind.c
>-                    ''',
>-                    deps='asn1util LIBTSOCKET samba3util')
>+                    source='''
>+                           lib/tldap.c
>+                           lib/tldap_util.c
>+                           lib/tldap_gensec_bind.c
>+                           ''',
>+                    deps='''
>+                         asn1util
>+                         LIBTSOCKET
>+                         samba3util
>+                         ''')
> 
> # libpdb.so should not expose internal symbols that are only usable
> # to the statically linked modules that are merged into libpdb.
>-- 
>2.10.2
>
>
>From 8050483c3c6a24965522da6e0a3beea3c0ff85b9 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:28:58 +0100
>Subject: [PATCH 07/61] s3:waf: Reformat samba-passdb
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index ea64cb4..868b3e6 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -163,9 +163,10 @@ bld.SAMBA3_LIBRARY('samba-passdb',
>                    pc_files=[],
>                    public_headers_install=True,
>                    public_headers='''
>-                   include/passdb.h
>-                   passdb/machine_sid.h
>-                   passdb/lookup_sid.h''',
>+                                  include/passdb.h
>+                                  passdb/machine_sid.h
>+                                  passdb/lookup_sid.h
>+                                  ''',
>                    abi_match=private_pdb_match,
>                    abi_directory='passdb/ABI',
>                    vnum='0.25.0')
>-- 
>2.10.2
>
>
>From 808916194bb49f36660cc7cdfb78667f9d618434 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:30:21 +0100
>Subject: [PATCH 08/61] s3:waf: Reformat pdb
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 45 +++++++++++++++++++++++++++------------------
> 1 file changed, 27 insertions(+), 18 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 868b3e6..3b13776 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -172,24 +172,33 @@ bld.SAMBA3_LIBRARY('samba-passdb',
>                    vnum='0.25.0')
> 
> bld.SAMBA3_SUBSYSTEM('pdb',
>-                   source='''passdb/pdb_get_set.c
>-                   passdb/passdb.c
>-                   lib/util_wellknown.c
>-                   lib/util_builtin.c
>-                   passdb/pdb_compat.c
>-                   lib/util_sid_passdb.c
>-                   lib/util_unixsids.c
>-                   passdb/lookup_sid.c
>-                   passdb/login_cache.c
>-                   passdb/account_pol.c
>-                   lib/privileges.c
>-                   lib/util_nscd.c
>-                   lib/winbind_util.c
>-                   passdb/pdb_util.c
>-                   passdb/pdb_interface.c
>-                   passdb/pdb_secrets.c
>-                   passdb/pdb_unixid.c''',
>-                   deps='secrets3 GROUPDB SERVER_MUTEX wbclient LIBCLI_AUTH flag_mapping samba-credentials')
>+                   source='''
>+                          passdb/pdb_get_set.c
>+                          passdb/passdb.c
>+                          lib/util_wellknown.c
>+                          lib/util_builtin.c
>+                          passdb/pdb_compat.c
>+                          lib/util_sid_passdb.c
>+                          lib/util_unixsids.c
>+                          passdb/lookup_sid.c
>+                          passdb/login_cache.c
>+                          passdb/account_pol.c
>+                          lib/privileges.c
>+                          lib/util_nscd.c
>+                          lib/winbind_util.c
>+                          passdb/pdb_util.c
>+                          passdb/pdb_interface.c
>+                          passdb/pdb_secrets.c
>+                          passdb/pdb_unixid.c''',
>+                   deps='''
>+                        secrets3
>+                        GROUPDB
>+                        SERVER_MUTEX
>+                        wbclient
>+                        LIBCLI_AUTH
>+                        flag_mapping
>+                        samba-credentials
>+                        ''')
> 
> bld.SAMBA3_LIBRARY('smbldaphelper',
>                    source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
>-- 
>2.10.2
>
>
>From c01a744cfbde933669fc58d3b6b6c32f9bd0e98f Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:30:53 +0100
>Subject: [PATCH 09/61] s3:waf Reformat smbldaphelper
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 3b13776..bb692f4 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -201,7 +201,10 @@ bld.SAMBA3_SUBSYSTEM('pdb',
>                         ''')
> 
> bld.SAMBA3_LIBRARY('smbldaphelper',
>-                   source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
>+                   source='''
>+                          passdb/pdb_ldap_schema.c
>+                          passdb/pdb_ldap_util.c
>+                          ''',
>                    deps='smbldap secrets3',
>                    allow_undefined_symbols=True,
>                    enabled=bld.CONFIG_SET('HAVE_LDAP'),
>-- 
>2.10.2
>
>
>From ac5235b7d1cdffc5812053d479ebfbee866f904a Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:32:10 +0100
>Subject: [PATCH 10/61] s3:waf: Reformat param
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 32 ++++++++++++++++++--------------
> 1 file changed, 18 insertions(+), 14 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index bb692f4..0084c20 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -215,20 +215,24 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
>                      deps='talloc')
> 
> bld.SAMBA3_SUBSYSTEM('param',
>-                   source='''param/loadparm.c
>-                   lib/sharesec.c
>-                   lib/ldap_debug_handler.c
>-                   lib/util_names.c''',
>-                   deps='''samba-util
>-                   PARAM_UTIL
>-                   ldap
>-                   lber
>-                   LOADPARM_CTX
>-                   samba3core
>-                   smbconf
>-                   param_local.h
>-                   param_global.h
>-                   cups''')
>+                   source='''
>+                          param/loadparm.c
>+                          lib/sharesec.c
>+                          lib/ldap_debug_handler.c
>+                          lib/util_names.c
>+                          ''',
>+                   deps='''
>+                        samba-util
>+                        PARAM_UTIL
>+                        ldap
>+                        lber
>+                        LOADPARM_CTX
>+                        samba3core
>+                        smbconf
>+                        param_local.h
>+                        param_global.h
>+                        cups
>+                        ''')
> 
> # this includes only the low level parse code, not stuff
> # that requires knowledge of security contexts
>-- 
>2.10.2
>
>
>From c28acf352b4a0f58682def816bf98211457cab7c Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:33:30 +0100
>Subject: [PATCH 11/61] s3:waf: Reformat smbregistry
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 24 +++++++++++++-----------
> 1 file changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 0084c20..37e1075 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -248,17 +248,19 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
>                     deps='samba-util')
> 
> bld.SAMBA3_LIBRARY('smbregistry',
>-                   source='''registry/reg_api.c
>-                   registry/reg_dispatcher.c
>-                   registry/reg_cachehook.c
>-                   registry/reg_objects.c
>-                   registry/reg_util_internal.c
>-                   lib/util_nttoken.c
>-                   registry/reg_backend_db.c
>-                   registry/reg_parse_internal.c
>-                   lib/cbuf.c
>-                   lib/srprs.c
>-                   registry/reg_init_basic.c''',
>+                   source='''
>+                          registry/reg_api.c
>+                          registry/reg_dispatcher.c
>+                          registry/reg_cachehook.c
>+                          registry/reg_objects.c
>+                          registry/reg_util_internal.c
>+                          lib/util_nttoken.c
>+                          registry/reg_backend_db.c
>+                          registry/reg_parse_internal.c
>+                          lib/cbuf.c
>+                          lib/srprs.c
>+                          registry/reg_init_basic.c
>+                          ''',
>                    deps='''
>                         smbd_shim
>                         tdb-wrap3
>-- 
>2.10.2
>
>
>From 77e314d9db879c8f66b20e65f433cff59d09115b Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:34:33 +0100
>Subject: [PATCH 12/61] s3:waf: Reformat REG_SMBCONF
>
>---
> source3/wscript_build | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 37e1075..e007dcb 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -279,10 +279,12 @@ bld.SAMBA3_LIBRARY('smbregistry',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
>-                    source='''registry/reg_backend_smbconf.c
>-                    registry/reg_init_smbconf.c
>-                    registry/reg_util_token.c
>-                    registry/reg_api_util.c''',
>+                    source='''
>+                           registry/reg_backend_smbconf.c
>+                           registry/reg_init_smbconf.c
>+                           registry/reg_util_token.c
>+                           registry/reg_api_util.c
>+                           ''',
>                     deps='smbregistry')
> 
> bld.SAMBA3_SUBSYSTEM('REG_FULL',
>-- 
>2.10.2
>
>
>From ea8877252bd7db54a659ba9101edcccf832685a4 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:35:12 +0100
>Subject: [PATCH 13/61] s3:waf: Reformat REG_FULL
>
>---
> source3/wscript_build | 26 +++++++++++++++-----------
> 1 file changed, 15 insertions(+), 11 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index e007dcb..860f7dc 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -288,17 +288,21 @@ bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
>                     deps='smbregistry')
> 
> bld.SAMBA3_SUBSYSTEM('REG_FULL',
>-                    source='''registry/reg_backend_printing.c
>-                    registry/reg_backend_shares.c
>-                    registry/reg_backend_netlogon_params.c
>-                    registry/reg_backend_prod_options.c
>-                    registry/reg_backend_tcpip_params.c
>-                    registry/reg_backend_hkpt_params.c
>-                    registry/reg_backend_current_version.c
>-                    registry/reg_backend_perflib.c
>-                    registry/reg_init_full.c
>-                    registry/reg_perfcount.c''',
>-                    deps='REG_SMBCONF tdb-wrap3')
>+                    source='''
>+                           registry/reg_backend_printing.c
>+                           registry/reg_backend_shares.c
>+                           registry/reg_backend_netlogon_params.c
>+                           registry/reg_backend_prod_options.c
>+                           registry/reg_backend_tcpip_params.c
>+                           registry/reg_backend_hkpt_params.c
>+                           registry/reg_backend_current_version.c
>+                           registry/reg_backend_perflib.c
>+                           registry/reg_init_full.c
>+                           registry/reg_perfcount.c''',
>+                    deps='''
>+                         REG_SMBCONF
>+                         tdb-wrap3
>+                         ''')
> 
> bld.SAMBA3_LIBRARY('popt_samba3',
>                    source='lib/popt_common.c',
>-- 
>2.10.2
>
>
>From 14b3ae2d691a1ffcc6197f75087ebc760197ce6e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:36:25 +0100
>Subject: [PATCH 14/61] s3:waf: Reformat samba3-util
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 43 +++++++++++++++++++++++++++----------------
> 1 file changed, 27 insertions(+), 16 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 860f7dc..4e4f0ad 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -319,22 +319,33 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
>                      public_deps='krb5samba asn1util k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
> 
> bld.SAMBA3_SUBSYSTEM('samba3util',
>-                   source='''lib/system.c
>-                   lib/sendfile.c
>-                   lib/recvfile.c
>-                   lib/time.c
>-                   lib/util_sid.c
>-                   lib/util_specialsids.c
>-                   lib/util_file.c
>-                   lib/util.c
>-                   lib/util_path.c
>-                   lib/util_procid.c
>-                   lib/util_sock.c
>-                   lib/util_tsock.c
>-                   lib/util_transfer_file.c
>-                   lib/sys_popen.c
>-                   lib/sock_exec.c''',
>-                   deps='ndr LIBTSOCKET samba-security NDR_SECURITY samba-util util_tdb sys_rw iov_buf')
>+                   source='''
>+                          lib/system.c
>+                          lib/sendfile.c
>+                          lib/recvfile.c
>+                          lib/time.c
>+                          lib/util_sid.c
>+                          lib/util_specialsids.c
>+                          lib/util_file.c
>+                          lib/util.c
>+                          lib/util_path.c
>+                          lib/util_procid.c
>+                          lib/util_sock.c
>+                          lib/util_tsock.c
>+                          lib/util_transfer_file.c
>+                          lib/sys_popen.c
>+                          lib/sock_exec.c
>+                          ''',
>+                   deps='''
>+                        ndr
>+                        LIBTSOCKET
>+                        samba-security
>+                        NDR_SECURITY
>+                        samba-util
>+                        util_tdb
>+                        sys_rw
>+                        iov_buf
>+                        ''')
> 
> if bld.env.with_ctdb:
>     SAMBA_CLUSTER_SUPPORT_SOURCES='''
>-- 
>2.10.2
>
>
>From c184b87462cfad02ef9d93830f14704b29681349 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:37:11 +0100
>Subject: [PATCH 15/61] s3:waf: Reformat TDB_LIB
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4e4f0ad..ce24805 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -376,10 +376,15 @@ bld.SAMBA3_LIBRARY('samba-cluster-support',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('TDB_LIB',
>-                     source='''lib/dbwrap/dbwrap_open.c
>-                     lib/dbwrap/dbwrap_watch.c
>-                     lib/g_lock.c''',
>-                     deps='dbwrap samba-cluster-support')
>+                     source='''
>+                            lib/dbwrap/dbwrap_open.c
>+                            lib/dbwrap/dbwrap_watch.c
>+                            lib/g_lock.c
>+                            ''',
>+                     deps='''
>+                          dbwrap
>+                          samba-cluster-support
>+                          ''')
> 
> bld.SAMBA3_LIBRARY('messages_dgm',
>                    source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
>-- 
>2.10.2
>
>
>From c7411eec1453c7da5e1d202a26e5877e64ba095c Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:37:47 +0100
>Subject: [PATCH 16/61] s3:waf: Reformat messages_dgm
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index ce24805..2cbc964 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -387,8 +387,17 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
>                           ''')
> 
> bld.SAMBA3_LIBRARY('messages_dgm',
>-                   source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
>-                   deps='''talloc samba-debug PTHREADPOOL msghdr genrand''',
>+                   source='''
>+                          lib/messages_dgm.c
>+                          lib/messages_dgm_ref.c
>+                          ''',
>+                   deps='''
>+                        talloc
>+                        samba-debug
>+                        PTHREADPOOL
>+                        msghdr
>+                        genrand
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('messages_util',
>-- 
>2.10.2
>
>
>From e4bb78fbd3bcabb9e03b19c43d4d097396110c9a Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:38:43 +0100
>Subject: [PATCH 17/61] s3:waf: Reformat samba3core
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 77 ++++++++++++++++++++++++++-------------------------
> 1 file changed, 40 insertions(+), 37 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 2cbc964..7f13ea9 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -406,41 +406,43 @@ bld.SAMBA3_LIBRARY('messages_util',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('samba3core',
>-                   source='''lib/messages.c
>-                   lib/util_cluster.c
>-                   lib/id_cache.c
>-                   lib/talloc_dict.c
>-                   lib/serverid.c
>-                   lib/server_id_watch.c
>-                   lib/server_id_db_util.c
>-                   lib/addrchange.c
>-                   ../lib/util/debug_s3.c
>-                   lib/dumpcore.c
>-                   lib/interface.c
>-                   lib/username.c
>-                   lib/smbrun.c
>-                   lib/wins_srv.c
>-                   lib/substitute.c
>-                   lib/substitute_generic.c
>-                   lib/ms_fnmatch.c
>-                   lib/tallocmsg.c
>-                   lib/dmallocmsg.c
>-                   intl/lang_tdb.c
>-                   lib/gencache.c
>-                   lib/util_event.c
>-                   lib/server_contexts.c
>-                   lib/server_prefork.c
>-                   lib/server_prefork_util.c
>-                   lib/ldap_escape.c
>-                   lib/fncall.c
>-                   libads/krb5_errs.c
>-                   lib/system_smbd.c
>-                   lib/audit.c
>-                   lib/tevent_wait.c
>-                   lib/idmap_cache.c
>-                   lib/util_ea.c
>-                   lib/background.c
>-                   lib/cleanupdb.c''',
>+                   source='''
>+                          lib/messages.c
>+                          lib/util_cluster.c
>+                          lib/id_cache.c
>+                          lib/talloc_dict.c
>+                          lib/serverid.c
>+                          lib/server_id_watch.c
>+                          lib/server_id_db_util.c
>+                          lib/addrchange.c
>+                          ../lib/util/debug_s3.c
>+                          lib/dumpcore.c
>+                          lib/interface.c
>+                          lib/username.c
>+                          lib/smbrun.c
>+                          lib/wins_srv.c
>+                          lib/substitute.c
>+                          lib/substitute_generic.c
>+                          lib/ms_fnmatch.c
>+                          lib/tallocmsg.c
>+                          lib/dmallocmsg.c
>+                          intl/lang_tdb.c
>+                          lib/gencache.c
>+                          lib/util_event.c
>+                          lib/server_contexts.c
>+                          lib/server_prefork.c
>+                          lib/server_prefork_util.c
>+                          lib/ldap_escape.c
>+                          lib/fncall.c
>+                          libads/krb5_errs.c
>+                          lib/system_smbd.c
>+                          lib/audit.c
>+                          lib/tevent_wait.c
>+                          lib/idmap_cache.c
>+                          lib/util_ea.c
>+                          lib/background.c
>+                          lib/cleanupdb.c
>+                          ''',
>                    deps='''
>                         samba3util
>                         LIBTSOCKET
>@@ -458,8 +460,9 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
>                         messages_util
>                         messages_dgm
>                         talloc_report
>-			access
>-                        TDB_LIB''')
>+                        access
>+                        TDB_LIB
>+                        ''')
> 
> bld.SAMBA3_LIBRARY('smbd_shim',
>                    source='''lib/smbd_shim.c''',
>-- 
>2.10.2
>
>
>From a028a4174651ebc34c19fd9bdf793822261a7fb7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:39:40 +0100
>Subject: [PATCH 18/61] s3:waf: Reformat libsmb
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 71 +++++++++++++++++++++++++++------------------------
> 1 file changed, 37 insertions(+), 34 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 7f13ea9..fc61cf1 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -474,41 +474,44 @@ bld.SAMBA3_SUBSYSTEM('auth_generic',
>                     deps='gse gensec')
> 
> bld.SAMBA3_LIBRARY('libsmb',
>-                   source='''libsmb/clientgen.c
>-                   libsmb/cliconnect.c
>-                   libsmb/clifile.c
>-                   libsmb/clispnego.c
>-                   libsmb/clirap.c
>-                   libsmb/clierror.c
>-                   libsmb/climessage.c
>-                   libsmb/clireadwrite.c
>-                   libsmb/clilist.c
>-                   libsmb/cliprint.c
>-                   libsmb/clitrans.c
>-                   libsmb/clisecdesc.c
>-                   libsmb/clidgram.c
>-                   libsmb/clistr.c
>-                   libsmb/cliquota.c
>-                   libsmb/clifsinfo.c
>-                   libsmb/clidfs.c
>-                   libsmb/clioplock.c
>-                   libsmb/clirap2.c
>-                   libsmb/async_smb.c
>-                   libsmb/reparse_symlink.c
>-                   libsmb/clisymlink.c
>-                   libsmb/smbsock_connect.c
>-                   libsmb/cli_smb2_fnum.c''',
>+                   source='''
>+                          libsmb/clientgen.c
>+                          libsmb/cliconnect.c
>+                          libsmb/clifile.c
>+                          libsmb/clispnego.c
>+                          libsmb/clirap.c
>+                          libsmb/clierror.c
>+                          libsmb/climessage.c
>+                          libsmb/clireadwrite.c
>+                          libsmb/clilist.c
>+                          libsmb/cliprint.c
>+                          libsmb/clitrans.c
>+                          libsmb/clisecdesc.c
>+                          libsmb/clidgram.c
>+                          libsmb/clistr.c
>+                          libsmb/cliquota.c
>+                          libsmb/clifsinfo.c
>+                          libsmb/clidfs.c
>+                          libsmb/clioplock.c
>+                          libsmb/clirap2.c
>+                          libsmb/async_smb.c
>+                          libsmb/reparse_symlink.c
>+                          libsmb/clisymlink.c
>+                          libsmb/smbsock_connect.c
>+                          libsmb/cli_smb2_fnum.c
>+                          ''',
>                    deps='''
>-                   auth_generic
>-                   CLDAP
>-                   LIBNMB
>-                   SPNEGO_PARSE
>-                   LIBTSOCKET
>-                   KRBCLIENT
>-                   NDR_IOCTL
>-                   cli_smb_common
>-                   util_cmdline
>-                   tevent''',
>+                        auth_generic
>+                        CLDAP
>+                        LIBNMB
>+                        SPNEGO_PARSE
>+                        LIBTSOCKET
>+                        KRBCLIENT
>+                        NDR_IOCTL
>+                        cli_smb_common
>+                        util_cmdline
>+                        tevent
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('CLDAP',
>-- 
>2.10.2
>
>
>From 86a4d8d6fe0938a36551817d7abaeab718f5178e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:43:28 +0100
>Subject: [PATCH 19/61] s3:waf: Reformat secrets3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index fc61cf1..aaf8a62 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -522,11 +522,18 @@ bld.SAMBA3_SUBSYSTEM('CLDAP',
> # PLEASE DO NOT make it depend on high level libraries like PDB, if you are
> # doing that your design is wrong and needs changing. -SSS
> bld.SAMBA3_LIBRARY('secrets3',
>-                   source='''passdb/secrets.c
>-                   passdb/machine_account_secrets.c
>-                   passdb/machine_sid.c
>-                   passdb/secrets_lsa.c''',
>-                   deps='NDR_SECRETS param samba3util dbwrap',
>+                   source='''
>+                          passdb/secrets.c
>+                          passdb/machine_account_secrets.c
>+                          passdb/machine_sid.c
>+                          passdb/secrets_lsa.c
>+                          ''',
>+                   deps='''
>+                        NDR_SECRETS
>+                        param
>+                        samba3util
>+                        dbwrap
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('smbldap',
>-- 
>2.10.2
>
>
>From 39507d583aaaa258d5627730e81c212a1d9714a9 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:44:41 +0100
>Subject: [PATCH 20/61] s3:waf: Reformat ads
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 41 +++++++++++++++++++++++++++--------------
> 1 file changed, 27 insertions(+), 14 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index aaf8a62..4f089da 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -548,20 +548,33 @@ bld.SAMBA3_LIBRARY('smbldap',
>                     public_headers='include/smbldap.h include/smb_ldap.h')
> 
> bld.SAMBA3_LIBRARY('ads',
>-                   source='''libads/ldap.c
>-                   libads/sasl.c
>-                   libads/sasl_wrapping.c
>-                   libads/krb5_setpw.c
>-                   libads/kerberos_util.c
>-                   libads/ldap_user.c
>-                   libads/ads_struct.c
>-                   libads/kerberos_keytab.c
>-                   libads/disp_sec.c
>-                   libads/ldap_utils.c
>-                   libads/ldap_schema.c
>-                   libads/util.c
>-                   libads/ndr.c''',
>-                   deps='cli-ldap-common krb5samba ldap lber KRBCLIENT param LIBNMB libsmb DCUTIL smbldap',
>+                   source='''
>+                          libads/ldap.c
>+                          libads/sasl.c
>+                          libads/sasl_wrapping.c
>+                          libads/krb5_setpw.c
>+                          libads/kerberos_util.c
>+                          libads/ldap_user.c
>+                          libads/ads_struct.c
>+                          libads/kerberos_keytab.c
>+                          libads/disp_sec.c
>+                          libads/ldap_utils.c
>+                          libads/ldap_schema.c
>+                          libads/util.c
>+                          libads/ndr.c
>+                          ''',
>+                   deps='''
>+                        cli-ldap-common
>+                        krb5samba
>+                        ldap
>+                        lber
>+                        KRBCLIENT
>+                        param
>+                        LIBNMB
>+                        libsmb
>+                        DCUTIL
>+                        smbldap
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
>-- 
>2.10.2
>
>
>From 00cf84a9422234d7622edaa1b221889209f32ca8 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:45:36 +0100
>Subject: [PATCH 21/61] s3:waf: Reformat smbconf
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 33 ++++++++++++++++++---------------
> 1 file changed, 18 insertions(+), 15 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4f089da..0a820ad 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -586,22 +586,25 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
>                     deps='samba-util krb5samba')
> 
> bld.SAMBA3_LIBRARY('smbconf',
>-                   source='''lib/smbconf/smbconf_init.c
>-                   lib/smbconf/smbconf_reg.c''',
>+                   source='''
>+                          lib/smbconf/smbconf_init.c
>+                          lib/smbconf/smbconf_reg.c
>+                          ''',
>                    deps='''
>-                   CHARSET3
>-                   LIBSMBCONF
>-                   REG_SMBCONF
>-                   SAMBA_VERSION
>-                   cap
>-                   charset
>-                   cli_smb_common
>-                   errors3
>-                   param
>-                   samba-util
>-                   smbregistry
>-                   talloc
>-                   util_reg''',
>+                        CHARSET3
>+                        LIBSMBCONF
>+                        REG_SMBCONF
>+                        SAMBA_VERSION
>+                        cap
>+                        charset
>+                        cli_smb_common
>+                        errors3
>+                        param
>+                        samba-util
>+                        smbregistry
>+                        talloc
>+                        util_reg
>+                        ''',
>                    public_headers='../lib/smbconf/smbconf.h',
>                    pc_files=[],
>                    vnum='0')
>-- 
>2.10.2
>
>
>From 4564040e19da95231473db85837b67becd8862e3 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:46:49 +0100
>Subject: [PATCH 22/61] s3:waf: Reformat smbd_base
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 233 +++++++++++++++++++++++++-------------------------
> 1 file changed, 117 insertions(+), 116 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 0a820ad..ce27810 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -638,123 +638,124 @@ if bld.CONFIG_SET('SAMBA_FAM_LIBS'):
> 
> bld.SAMBA3_LIBRARY('smbd_base',
>                    source='''
>-                   smbd/server_reload.c
>-                   smbd/files.c
>-                   smbd/connection.c
>-                   smbd/utmp.c
>-                   smbd/session.c
>-                   smbd/dfree.c
>-                   smbd/dir.c
>-                   smbd/password.c
>-                   smbd/conn_msg.c
>-                   smbd/conn_idle.c
>-                   smbd/share_access.c
>-                   smbd/fileio.c
>-                   smbd/ipc.c
>-                   smbd/lanman.c
>-                   smbd/negprot.c
>-                   smbd/message.c
>-                   smbd/nttrans.c
>-                   smbd/pipes.c
>-                   smbd/reply.c
>-                   smbd/sesssetup.c
>-                   smbd/trans2.c
>-                   smbd/uid.c
>-                   smbd/dosmode.c
>-                   smbd/filename.c
>-                   smbd/open.c
>-                   smbd/close.c
>-                   smbd/blocking.c
>-                   smbd/sec_ctx.c
>-                   smbd/srvstr.c
>-                   smbd/vfs.c
>-                   smbd/perfcount.c
>-                   smbd/statcache.c
>-                   smbd/seal.c
>-                   smbd/posix_acls.c
>-                   lib/sysacls.c
>-                   smbd/process.c
>-                   smbd/service.c
>-                   smbd/error.c
>-                   printing/printspoolss.c
>-                   lib/sessionid_tdb.c
>-                   lib/conn_tdb.c
>-                   smbd/fake_file.c
>-                   smbd/quotas.c
>-                   smbd/ntquotas.c
>-                   smbd/msdfs.c
>-                   smbd/aio.c smbd/statvfs.c
>-                   smbd/dmapi.c
>-                   smbd/signing.c
>-                   smbd/file_access.c
>-                   smbd/dnsregister.c smbd/globals.c
>-                   smbd/smb2_server.c
>-                   smbd/smb2_glue.c
>-                   smbd/smb2_negprot.c
>-                   smbd/smb2_sesssetup.c
>-                   smbd/smb2_tcon.c
>-                   smbd/smb2_create.c
>-                   smbd/smb2_close.c
>-                   smbd/smb2_flush.c
>-                   smbd/smb2_read.c
>-                   smbd/smb2_write.c
>-                   smbd/smb2_lock.c
>-                   smbd/smb2_ioctl.c
>-                   smbd/smb2_ioctl_dfs.c
>-                   smbd/smb2_ioctl_filesys.c
>-                   smbd/smb2_ioctl_named_pipe.c
>-                   smbd/smb2_ioctl_network_fs.c
>-                   smbd/smb2_keepalive.c
>-                   smbd/smb2_query_directory.c
>-                   smbd/smb2_notify.c
>-                   smbd/smb2_getinfo.c
>-                   smbd/smb2_setinfo.c
>-                   smbd/smb2_break.c
>-                   smbd/smbXsrv_version.c
>-                   smbd/smbXsrv_client.c
>-                   smbd/smbXsrv_session.c
>-                   smbd/smbXsrv_tcon.c
>-                   smbd/smbXsrv_open.c
>-                   smbd/server_exit.c
>-                   smbd/durable.c
>-                   smbd/scavenger.c
>-                   smbd/mangle.c
>-                   smbd/mangle_hash.c
>-                   smbd/mangle_hash2.c
>-                   smbd/oplock.c
>-                   smbd/oplock_irix.c
>-                   smbd/oplock_linux.c
>-                   smbd/notify.c
>-                   smbd/notify_msg.c
>-                   smbd/build_options.c''' + NOTIFY_SOURCES,
>+                          smbd/server_reload.c
>+                          smbd/files.c
>+                          smbd/connection.c
>+                          smbd/utmp.c
>+                          smbd/session.c
>+                          smbd/dfree.c
>+                          smbd/dir.c
>+                          smbd/password.c
>+                          smbd/conn_msg.c
>+                          smbd/conn_idle.c
>+                          smbd/share_access.c
>+                          smbd/fileio.c
>+                          smbd/ipc.c
>+                          smbd/lanman.c
>+                          smbd/negprot.c
>+                          smbd/message.c
>+                          smbd/nttrans.c
>+                          smbd/pipes.c
>+                          smbd/reply.c
>+                          smbd/sesssetup.c
>+                          smbd/trans2.c
>+                          smbd/uid.c
>+                          smbd/dosmode.c
>+                          smbd/filename.c
>+                          smbd/open.c
>+                          smbd/close.c
>+                          smbd/blocking.c
>+                          smbd/sec_ctx.c
>+                          smbd/srvstr.c
>+                          smbd/vfs.c
>+                          smbd/perfcount.c
>+                          smbd/statcache.c
>+                          smbd/seal.c
>+                          smbd/posix_acls.c
>+                          lib/sysacls.c
>+                          smbd/process.c
>+                          smbd/service.c
>+                          smbd/error.c
>+                          printing/printspoolss.c
>+                          lib/sessionid_tdb.c
>+                          lib/conn_tdb.c
>+                          smbd/fake_file.c
>+                          smbd/quotas.c
>+                          smbd/ntquotas.c
>+                          smbd/msdfs.c
>+                          smbd/aio.c smbd/statvfs.c
>+                          smbd/dmapi.c
>+                          smbd/signing.c
>+                          smbd/file_access.c
>+                          smbd/dnsregister.c smbd/globals.c
>+                          smbd/smb2_server.c
>+                          smbd/smb2_glue.c
>+                          smbd/smb2_negprot.c
>+                          smbd/smb2_sesssetup.c
>+                          smbd/smb2_tcon.c
>+                          smbd/smb2_create.c
>+                          smbd/smb2_close.c
>+                          smbd/smb2_flush.c
>+                          smbd/smb2_read.c
>+                          smbd/smb2_write.c
>+                          smbd/smb2_lock.c
>+                          smbd/smb2_ioctl.c
>+                          smbd/smb2_ioctl_dfs.c
>+                          smbd/smb2_ioctl_filesys.c
>+                          smbd/smb2_ioctl_named_pipe.c
>+                          smbd/smb2_ioctl_network_fs.c
>+                          smbd/smb2_keepalive.c
>+                          smbd/smb2_query_directory.c
>+                          smbd/smb2_notify.c
>+                          smbd/smb2_getinfo.c
>+                          smbd/smb2_setinfo.c
>+                          smbd/smb2_break.c
>+                          smbd/smbXsrv_version.c
>+                          smbd/smbXsrv_client.c
>+                          smbd/smbXsrv_session.c
>+                          smbd/smbXsrv_tcon.c
>+                          smbd/smbXsrv_open.c
>+                          smbd/server_exit.c
>+                          smbd/durable.c
>+                          smbd/scavenger.c
>+                          smbd/mangle.c
>+                          smbd/mangle_hash.c
>+                          smbd/mangle_hash2.c
>+                          smbd/oplock.c
>+                          smbd/oplock_irix.c
>+                          smbd/oplock_linux.c
>+                          smbd/notify.c
>+                          smbd/notify_msg.c
>+                          smbd/build_options.c
>+                          ''' + NOTIFY_SOURCES,
>                    deps='''
>-                   talloc
>-                   tevent
>-                   pdb
>-                   libsmb
>-                   msrpc3
>-                   vfs
>-                   vfs_default
>-                   vfs_posixacl
>-		   inotify
>-                   popt_samba3
>-                   samba3core
>-                   smbd_conn
>-                   param_service
>-                   AVAHI
>-                   PRINTBASE
>-                   PROFILE
>-                   LOCKING
>-                   LIBADS_SERVER
>-                   LIBAFS
>-                   RPC_SERVICE
>-                   NDR_SMBXSRV
>-                   LEASES_DB
>-                   sysquotas
>-                   NDR_SMB_ACL
>-                   netapi
>-                   NDR_IOCTL
>-                   notifyd
>+                        talloc
>+                        tevent
>+                        pdb
>+                        libsmb
>+                        msrpc3
>+                        vfs
>+                        vfs_default
>+                        vfs_posixacl
>+                        inotify
>+                        popt_samba3
>+                        samba3core
>+                        smbd_conn
>+                        param_service
>+                        AVAHI
>+                        PRINTBASE
>+                        PROFILE
>+                        LOCKING
>+                        LIBADS_SERVER
>+                        LIBAFS
>+                        RPC_SERVICE
>+                        NDR_SMBXSRV
>+                        LEASES_DB
>+                        sysquotas
>+                        NDR_SMB_ACL
>+                        netapi
>+                        NDR_IOCTL
>+                        notifyd
>                    ''' +
>                    bld.env['dmapi_lib'] +
>                    bld.env['legacy_quota_libs'] +
>-- 
>2.10.2
>
>
>From 29a5ac5de9d3f4d5915faf8a6b79bbfd2faecbec Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:47:18 +0100
>Subject: [PATCH 23/61] s3:waf: Reformat LOCKING
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index ce27810..311b828 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -763,16 +763,19 @@ bld.SAMBA3_LIBRARY('smbd_base',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('LOCKING',
>-                    source='''locking/locking.c
>-                    locking/brlock.c
>-                    locking/posix.c
>-                    locking/share_mode_lock.c''',
>+                    source='''
>+                           locking/locking.c
>+                           locking/brlock.c
>+                           locking/posix.c
>+                           locking/share_mode_lock.c
>+                           ''',
>                     deps='''
>-                    tdb
>-                    talloc
>-                    LEASES_DB
>-                    NDR_OPEN_FILES
>-                    FNAME_UTIL''')
>+                         tdb
>+                         talloc
>+                         LEASES_DB
>+                         NDR_OPEN_FILES
>+                         FNAME_UTIL
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('LEASES_DB',
>                     source='locking/leases_db.c',
>-- 
>2.10.2
>
>
>From 80533fe8affbb740ced6b0bcd3e29e379cdf8283 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:47:54 +0100
>Subject: [PATCH 24/61] s3:waf: Reformat PRINTBASE
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 311b828..043f4f1 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -791,8 +791,14 @@ else:
>                          deps='')
> 
> bld.SAMBA3_SUBSYSTEM('PRINTBASE',
>-                    source='''printing/notify.c printing/printing_db.c''',
>-                    deps='samba-util tdb')
>+                    source='''
>+                           printing/notify.c
>+                           printing/printing_db.c
>+                           ''',
>+                    deps='''
>+                         samba-util
>+                         tdb
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
>                     source='''printing/printing.c
>-- 
>2.10.2
>
>
>From 76437bca2b8be85d441d70190f90dc2ebf68e007 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:48:35 +0100
>Subject: [PATCH 25/61] s3:waf: Reformat PRINTBACKEND
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 043f4f1..f6533dd 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -801,13 +801,21 @@ bld.SAMBA3_SUBSYSTEM('PRINTBASE',
>                          ''')
> 
> bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
>-                    source='''printing/printing.c
>-                    printing/nt_printing.c
>-                    printing/nt_printing_tdb.c
>-                    printing/nt_printing_migrate_internal.c
>-                    printing/nt_printing_ads.c
>-                    printing/queue_process.c''',
>-                    deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate SPOOLSSD')
>+                    source='''
>+                           printing/printing.c
>+                           printing/nt_printing.c
>+                           printing/nt_printing_tdb.c
>+                           printing/nt_printing_migrate_internal.c
>+                           printing/nt_printing_ads.c
>+                           printing/queue_process.c
>+                           ''',
>+                    deps='''
>+                         PRINTBASE
>+                         LIBADS_PRINTER
>+                         tdb
>+                         printing_migrate
>+                         SPOOLSSD
>+                         ''')
> 
> bld.SAMBA3_LIBRARY('printing_migrate',
>                     source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
>-- 
>2.10.2
>
>
>From 26bbc2a208226a12e1411b6ded70650eab0232cd Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:49:25 +0100
>Subject: [PATCH 26/61] s3:waf: Reformat printing_migrate
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index f6533dd..a67a1b2 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -818,8 +818,18 @@ bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
>                          ''')
> 
> bld.SAMBA3_LIBRARY('printing_migrate',
>-                    source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
>-                    deps='NDR_NTPRINTING cli_spoolss RPC_NDR_WINREG LIBCLI_WINREG param',
>+                    source='''
>+                           printing/nt_printing_migrate.c
>+                           rpc_client/cli_winreg_spoolss.c
>+                           printing/nt_printing_os2.c
>+                           ''',
>+                    deps='''
>+                         NDR_NTPRINTING
>+                         cli_spoolss
>+                         RPC_NDR_WINREG
>+                         LIBCLI_WINREG
>+                         param
>+                         ''',
>                     private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('PRINTING',
>-- 
>2.10.2
>
>
>From 2ada38cab34e2e7e94abcf1dd24638f5289bc05e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:49:59 +0100
>Subject: [PATCH 27/61] s3:waf: Reformat PRINTING
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 28 +++++++++++++++++-----------
> 1 file changed, 17 insertions(+), 11 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a67a1b2..5ab388c 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -833,17 +833,23 @@ bld.SAMBA3_LIBRARY('printing_migrate',
>                     private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('PRINTING',
>-                    source='''printing/pcap.c
>-                    printing/print_svid.c
>-                    printing/print_aix.c
>-                    printing/print_cups.c
>-                    printing/print_generic.c
>-                    printing/lpq_parse.c
>-                    printing/load.c
>-                    printing/print_standard.c
>-                    printing/print_iprint.c
>-                    printing/printer_list.c''',
>-                    deps='NDR_PRINTCAP tdb cups')
>+                    source='''
>+                           printing/pcap.c
>+                           printing/print_svid.c
>+                           printing/print_aix.c
>+                           printing/print_cups.c
>+                           printing/print_generic.c
>+                           printing/lpq_parse.c
>+                           printing/load.c
>+                           printing/print_standard.c
>+                           printing/print_iprint.c
>+                           printing/printer_list.c
>+                           ''',
>+                    deps='''
>+                         NDR_PRINTCAP
>+                         tdb
>+                         cups
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
>                     source='lib/filename_util.c',
>-- 
>2.10.2
>
>
>From 4e31ee820e24858a31323ac8d8846a578f2f09c5 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:50:39 +0100
>Subject: [PATCH 28/61] s3:waf: Reformat LIBNET_DSSYNC
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 5ab388c..80b38d2 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -866,10 +866,15 @@ bld.SAMBA3_LIBRARY('net_keytab',
> 
> 
> bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
>-                    source='''libnet/libnet_dssync.c
>-                    libnet/libnet_dssync_passdb.c
>-                    libnet/libnet_dssync_keytab.c''',
>-                    deps='LIBNET RPC_NDR_DRSUAPI')
>+                    source='''
>+                           libnet/libnet_dssync.c
>+                           libnet/libnet_dssync_passdb.c
>+                           libnet/libnet_dssync_keytab.c
>+                           ''',
>+                    deps='''
>+                         LIBNET
>+                         RPC_NDR_DRSUAPI
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
>                     source='''libnet/libnet_samsync.c
>-- 
>2.10.2
>
>
>From dca4b587c779953ff42480ccc2f031e8293d9762 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:51:12 +0100
>Subject: [PATCH 29/61] s3:waf: Reformat LIBNET_SAMSYNC
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 17 +++++++++++------
> 1 file changed, 11 insertions(+), 6 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 80b38d2..beb35ec 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -877,12 +877,17 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
>                          ''')
> 
> bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
>-                    source='''libnet/libnet_samsync.c
>-                    libnet/libnet_samsync_ldif.c
>-                    libnet/libnet_samsync_passdb.c
>-                    libnet/libnet_samsync_display.c
>-                    libnet/libnet_samsync_keytab.c''',
>-                    deps='LIBNET LIBCLI_SAMSYNC')
>+                    source='''
>+                           libnet/libnet_samsync.c
>+                           libnet/libnet_samsync_ldif.c
>+                           libnet/libnet_samsync_passdb.c
>+                           libnet/libnet_samsync_display.c
>+                           libnet/libnet_samsync_keytab.c
>+                           ''',
>+                    deps='''
>+                         LIBNET
>+                         LIBCLI_SAMSYNC
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
>                     source='lib/eventlog/eventlog.c',
>-- 
>2.10.2
>
>
>From 92ac130806462d89b8a741fb23b9a3f7cd61aa51 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:51:49 +0100
>Subject: [PATCH 30/61] s3:waf: Reformat LIBNMB
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index beb35ec..5d1a222 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -894,13 +894,21 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
>                     deps='NDR_EVENTLOG tdb')
> 
> bld.SAMBA3_SUBSYSTEM('LIBNMB',
>-                     source='''libsmb/unexpected.c
>-                     libsmb/namecache.c
>-                     libsmb/nmblib.c
>-                     libsmb/namequery.c
>-                     libsmb/conncache.c
>-                     libads/sitename_cache.c''',
>-                     deps='LIBTSOCKET samba3util addns lmhosts resolv')
>+                     source='''
>+                            libsmb/unexpected.c
>+                            libsmb/namecache.c
>+                            libsmb/nmblib.c
>+                            libsmb/namequery.c
>+                            libsmb/conncache.c
>+                            libads/sitename_cache.c
>+                            ''',
>+                     deps='''
>+                          LIBTSOCKET
>+                          samba3util
>+                          addns
>+                          lmhosts
>+                          resolv
>+                          ''')
> 
> bld.SAMBA3_SUBSYSTEM('SERVICES',
>                     source='''services/svc_spoolss.c
>-- 
>2.10.2
>
>
>From c5650464c171cfb61065145363e468f61e95a027 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:52:35 +0100
>Subject: [PATCH 31/61] s3:waf: Reformat SERVICES
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 5d1a222..8f9364c 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -911,12 +911,14 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
>                           ''')
> 
> bld.SAMBA3_SUBSYSTEM('SERVICES',
>-                    source='''services/svc_spoolss.c
>-                    services/svc_rcinit.c
>-                    services/svc_winreg_glue.c
>-                    services/svc_netlogon.c
>-                    services/svc_winreg.c
>-                    services/svc_wins.c''',
>+                    source='''
>+                           services/svc_spoolss.c
>+                           services/svc_rcinit.c
>+                           services/svc_winreg_glue.c
>+                           services/svc_netlogon.c
>+                           services/svc_winreg.c
>+                           services/svc_wins.c
>+                           ''',
>                     deps='samba-util')
> 
> bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
>-- 
>2.10.2
>
>
>From 8321ad46016b4235dc0e85b77a7bf34609b5be52 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:53:15 +0100
>Subject: [PATCH 32/61] s3:waf: Reformat PLAINTEXT_AUTH
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 10 ++++++++--
> 1 file changed, 8 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 8f9364c..eb62eea 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -922,8 +922,14 @@ bld.SAMBA3_SUBSYSTEM('SERVICES',
>                     deps='samba-util')
> 
> bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
>-                    source='''auth/pampass.c auth/pass_check.c''',
>-                    deps='pam PAM_ERRORS')
>+                    source='''
>+                           auth/pampass.c
>+                           auth/pass_check.c
>+                           ''',
>+                    deps='''
>+                         pam
>+                         PAM_ERRORS
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
>                     source='libsmb/passchange.c',
>-- 
>2.10.2
>
>
>From 5c721baf9016aefcb44aab24b6540a101a3c20ba Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:53:39 +0100
>Subject: [PATCH 33/61] s3:waf: Reformat PASSCHANGE
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index eb62eea..8fde6f8 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -933,10 +933,12 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
> 
> bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
>                     source='libsmb/passchange.c',
>-                    deps='''LIBCLI_SAMR
>-                    INIT_LSA
>-                    msrpc3
>-                    krb5samba''')
>+                    deps='''
>+                         LIBCLI_SAMR
>+                         INIT_LSA
>+                         msrpc3
>+                         krb5samba
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
>                     source='lib/version.c',
>-- 
>2.10.2
>
>
>From 34c9ab9bd98cb7d231969bb64ef0b29134659812 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:54:14 +0100
>Subject: [PATCH 34/61] s3:waf: Reformat SLCACHE
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 8fde6f8..4cd9b2e 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -946,7 +946,10 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
> 
> bld.SAMBA3_SUBSYSTEM('SLCACHE',
>                     source='libsmb/samlogon_cache.c',
>-                    deps='samba-util tdb')
>+                    deps='''
>+                         samba-util
>+                         tdb
>+                         ''')
> 
> bld.SAMBA3_SUBSYSTEM('DCUTIL',
>                     source='''libsmb/namequery_dc.c
>-- 
>2.10.2
>
>
>From 9c5d93ccf60cd39787e592c8f7cd8b56468911c7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:54:41 +0100
>Subject: [PATCH 35/61] s3:waf: Reformat DCUTIL
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 14 ++++++++++----
> 1 file changed, 10 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4cd9b2e..4dd4bb7 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -952,10 +952,16 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
>                          ''')
> 
> bld.SAMBA3_SUBSYSTEM('DCUTIL',
>-                    source='''libsmb/namequery_dc.c
>-                    libsmb/trustdom_cache.c
>-                    libsmb/dsgetdcname.c''',
>-                    deps='ads msrpc3 libcli_lsa3')
>+                    source='''
>+                           libsmb/namequery_dc.c
>+                           libsmb/trustdom_cache.c
>+                           libsmb/dsgetdcname.c
>+                           ''',
>+                    deps='''
>+                         ads
>+                         msrpc3
>+                         libcli_lsa3
>+                         ''')
> 
> bld.SAMBA3_LIBRARY('trusts_util',
>                    source='libsmb/trusts_util.c',
>-- 
>2.10.2
>
>
>From 20e7ed199ab3ebef7e0efe3b47e5ed56ba8ae735 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:55:24 +0100
>Subject: [PATCH 36/61] s3:waf: Reformat trusts_util
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4dd4bb7..e966d23 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -965,7 +965,11 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
> 
> bld.SAMBA3_LIBRARY('trusts_util',
>                    source='libsmb/trusts_util.c',
>-                   deps='libcli_netlogon3 msrpc3 samba-passdb',
>+                   deps='''
>+                        libcli_netlogon3
>+                        msrpc3
>+                        samba-passdb
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
>-- 
>2.10.2
>
>
>From ee636a417acabed56e903ed4fe577ffcef18e4c9 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:56:00 +0100
>Subject: [PATCH 37/61] s3:waf: Reformat samba3-util
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index e966d23..e0ded5d 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -977,8 +977,18 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
>                     deps='talloc samba3-util')
> 
> bld.SAMBA3_LIBRARY('samba3-util',
>-                   source='''lib/util_sec.c lib/util_str.c lib/adt_tree.c lib/util_malloc.c lib/namearray.c lib/file_id.c''',
>-                   deps='samba-util charset',
>+                   source='''
>+                          lib/util_sec.c
>+                          lib/util_str.c
>+                          lib/adt_tree.c
>+                          lib/util_malloc.c
>+                          lib/namearray.c
>+                          lib/file_id.c
>+                          ''',
>+                   deps='''
>+                        samba-util
>+                        charset
>+                        ''',
>                    private_library=True)
> 
> bld.SAMBA_LIBRARY('xattr_tdb',
>-- 
>2.10.2
>
>
>From 8144b232626bc1701a63b958ab967f832c00b715 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:56:57 +0100
>Subject: [PATCH 38/61] s3:waf: Reformat CHARSET3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index e0ded5d..f2581a5 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -997,9 +997,18 @@ bld.SAMBA_LIBRARY('xattr_tdb',
>                   private_library=True)
> 
> bld.SAMBA3_LIBRARY('CHARSET3',
>-                    source='''lib/charcnv.c lib/fstring.c''',
>-                    public_deps='ICONV_WRAPPER charset',
>-                    deps='samba-util samba3-util',
>+                    source='''
>+                           lib/charcnv.c
>+                           lib/fstring.c
>+                           ''',
>+                    public_deps='''
>+                                ICONV_WRAPPER
>+                                charset
>+                                ''',
>+                    deps='''
>+                         samba-util
>+                         samba3-util
>+                         ''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('errors3',
>-- 
>2.10.2
>
>
>From 8ecd4580d086a264c313af974de9aeddc45dd013 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:57:22 +0100
>Subject: [PATCH 39/61] s3:waf: Reformat errors3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index f2581a5..8fb29ac 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1012,7 +1012,11 @@ bld.SAMBA3_LIBRARY('CHARSET3',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('errors3',
>-                     source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
>+                     source='''
>+                            libsmb/errormap.c
>+                            libsmb/smberr.c
>+                            lib/errmap_unix.c
>+                            ''',
>                      deps='samba-errors')
> 
> bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
>-- 
>2.10.2
>
>
>From c7494b46cfae2746e57209383d64e9dba66a5d28 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:58:28 +0100
>Subject: [PATCH 40/61] s3:waf: Reformat libcli_netlogon3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 13 +++++++++++--
> 1 file changed, 11 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 8fb29ac..4e2a0d5 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1029,8 +1029,17 @@ bld.SAMBA3_LIBRARY('libcli_lsa3',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('libcli_netlogon3',
>-                   source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
>-                   deps='msrpc3 RPC_NDR_NETLOGON INIT_NETLOGON cliauth param NETLOGON_CREDS_CLI',
>+                   source='''
>+                          rpc_client/cli_netlogon.c
>+                          rpc_client/util_netlogon.c
>+                          ''',
>+                   deps='''
>+                        msrpc3
>+                        RPC_NDR_NETLOGON
>+                        INIT_NETLOGON
>+                        cliauth
>+                        param
>+                        NETLOGON_CREDS_CLI''',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('cli_spoolss',
>-- 
>2.10.2
>
>
>From 4bb90e06928ca96c57bc85708f1230051c77b72f Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 10:59:14 +0100
>Subject: [PATCH 41/61] s3:waf: Reformat cli_spoolss
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 11 ++++++++---
> 1 file changed, 8 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 4e2a0d5..b5e2be8 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1043,9 +1043,14 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('cli_spoolss',
>-                   source='''rpc_client/cli_spoolss.c
>-                   rpc_client/init_spoolss.c''',
>-                   deps='RPC_NDR_SPOOLSS param secrets3',
>+                   source='''
>+                          rpc_client/cli_spoolss.c
>+                          rpc_client/init_spoolss.c
>+                          ''',
>+                   deps='''
>+                        RPC_NDR_SPOOLSS
>+                        param
>+                        secrets3''',
>                    private_library=True)
> 
> bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG',
>-- 
>2.10.2
>
>
>From a2edf4d603cc6bbd33208df3a34835b39a25d4e5 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:00:00 +0100
>Subject: [PATCH 42/61] s3:waf: Reformat smbclient
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 30 ++++++++++++++++--------------
> 1 file changed, 16 insertions(+), 14 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index b5e2be8..2d02eab 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1108,21 +1108,23 @@ bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
> 
> 
> bld.SAMBA3_BINARY('client/smbclient',
>-                 source='''client/client.c
>-                 client/clitar.c
>-                 client/dnsbrowse.c''',
>+                 source='''
>+                        client/client.c
>+                        client/clitar.c
>+                        client/dnsbrowse.c
>+                        ''',
>                  deps='''
>-                 talloc
>-                 popt_samba3
>-                 param
>-                 ndr-standard
>-                 SMBREADLINE
>-                 libsmb
>-                 msrpc3
>-                 RPC_NDR_SRVSVC
>-                 cli_smb_common
>-		 archive
>-                 ''')
>+                      talloc
>+                      popt_samba3
>+                      param
>+                      ndr-standard
>+                      SMBREADLINE
>+                      libsmb
>+                      msrpc3
>+                      RPC_NDR_SRVSVC
>+                      cli_smb_common
>+                      archive
>+                      ''')
> 
> bld.SAMBA3_BINARY('smbspool',
>                  source='client/smbspool.c',
>-- 
>2.10.2
>
>
>From bdf78cc0d2241b2f9d7ca1d58d9555e91c024cb5 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:00:20 +0100
>Subject: [PATCH 43/61] s3:waf: Reformat smbspool
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 2d02eab..fe8afdb 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1129,11 +1129,12 @@ bld.SAMBA3_BINARY('client/smbclient',
> bld.SAMBA3_BINARY('smbspool',
>                  source='client/smbspool.c',
>                  deps='''
>-                 talloc
>-                 popt_samba3
>-                 param
>-                 libsmb
>-                 samba3core''')
>+                      talloc
>+                      popt_samba3
>+                      param
>+                      libsmb
>+                      samba3core
>+                      ''')
> 
> bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
>                  source='client/smbspool_krb5_wrapper.c',
>-- 
>2.10.2
>
>
>From 399651642aabe4159b8cfe70e5e1e33a8b4e0a19 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:00:37 +0100
>Subject: [PATCH 44/61] s3:waf: Reformat smbspool_krb5_wrapper
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index fe8afdb..a560e9b 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1139,9 +1139,9 @@ bld.SAMBA3_BINARY('smbspool',
> bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
>                  source='client/smbspool_krb5_wrapper.c',
>                  deps='''
>-                 DYNCONFIG
>-                 cups
>-                 ''',
>+                      DYNCONFIG
>+                      cups
>+                      ''',
>                  install_path='${LIBEXECDIR}/samba',
>                  enabled=bld.CONFIG_SET('HAVE_CUPS'))
> 
>-- 
>2.10.2
>
>
>From a0f9cdcdc47c06521141c656c8db2a3d9d025f06 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:00:57 +0100
>Subject: [PATCH 45/61] s3:waf: Reformat locktest2
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a560e9b..ed8c9bb 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1148,10 +1148,11 @@ bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
> bld.SAMBA3_BINARY('locktest2',
>                  source='torture/locktest2.c',
>                  deps='''
>-                 talloc
>-                 param
>-                 libsmb
>-                 LOCKING''',
>+                      talloc
>+                      param
>+                      libsmb
>+                      LOCKING
>+                      ''',
>                  install=False)
> 
> smbstatus_source = 'utils/status.c smbd/notify_msg.c'
>-- 
>2.10.2
>
>
>From 5a6f1c4fb5c6d8694ebae04f4e48552b85cf9b17 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:01:14 +0100
>Subject: [PATCH 46/61] s3:waf: Reformat smbstatus
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index ed8c9bb..d6ce3fe 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1165,12 +1165,13 @@ else:
> bld.SAMBA3_BINARY('smbstatus',
>                  source=smbstatus_source,
>                  deps='''
>-                 talloc
>-                 param
>-                 popt_samba3
>-                 smbd_base
>-                 LOCKING
>-                 PROFILE''')
>+                      talloc
>+                      param
>+                      popt_samba3
>+                      smbd_base
>+                      LOCKING
>+                      PROFILE
>+                      ''')
> 
> bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
>                  source='''torture/torture.c
>-- 
>2.10.2
>
>
>From 6c41219f84c8c0e21250dea1e45bd4071d22e58f Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:01:52 +0100
>Subject: [PATCH 47/61] s3:waf: Reformat smbtorture3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 90 ++++++++++++++++++++++++++-------------------------
> 1 file changed, 46 insertions(+), 44 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index d6ce3fe..440cdca 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1174,51 +1174,53 @@ bld.SAMBA3_BINARY('smbstatus',
>                       ''')
> 
> bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
>-                 source='''torture/torture.c
>-                 torture/nbio.c
>-                 torture/scanner.c
>-                 torture/utable.c
>-                 torture/denytest.c
>-                 torture/mangle_test.c
>-                 torture/nbench.c
>-                 torture/test_async_echo.c
>-                 torture/test_addrchange.c
>-                 torture/test_posix_append.c
>-                 torture/test_nttrans_create.c
>-                 torture/test_nttrans_fsctl.c
>-                 torture/test_case_insensitive.c
>-                 torture/test_notify_online.c
>-                 torture/test_chain3.c
>-                 torture/test_smb2.c
>-                 torture/test_authinfo_structs.c
>-                 torture/test_smbsock_any_connect.c
>-                 torture/test_cleanup.c
>-                 torture/test_notify.c
>-                 lib/tevent_barrier.c
>-                 torture/test_dbwrap_watch.c
>-                 torture/test_idmap_tdb_common.c
>-                 torture/test_dbwrap_ctdb.c
>-                 torture/test_buffersize.c
>-                 torture/test_messaging_read.c
>-                 torture/test_messaging_fd_passing.c
>-                 torture/test_oplock_cancel.c
>-                 torture/test_pthreadpool_tevent.c
>-                 torture/bench_pthreadpool.c
>-                 torture/wbc_async.c''',
>+                 source='''
>+                        torture/torture.c
>+                        torture/nbio.c
>+                        torture/scanner.c
>+                        torture/utable.c
>+                        torture/denytest.c
>+                        torture/mangle_test.c
>+                        torture/nbench.c
>+                        torture/test_async_echo.c
>+                        torture/test_addrchange.c
>+                        torture/test_posix_append.c
>+                        torture/test_nttrans_create.c
>+                        torture/test_nttrans_fsctl.c
>+                        torture/test_case_insensitive.c
>+                        torture/test_notify_online.c
>+                        torture/test_chain3.c
>+                        torture/test_smb2.c
>+                        torture/test_authinfo_structs.c
>+                        torture/test_smbsock_any_connect.c
>+                        torture/test_cleanup.c
>+                        torture/test_notify.c
>+                        lib/tevent_barrier.c
>+                        torture/test_dbwrap_watch.c
>+                        torture/test_idmap_tdb_common.c
>+                        torture/test_dbwrap_ctdb.c
>+                        torture/test_buffersize.c
>+                        torture/test_messaging_read.c
>+                        torture/test_messaging_fd_passing.c
>+                        torture/test_oplock_cancel.c
>+                        torture/test_pthreadpool_tevent.c
>+                        torture/bench_pthreadpool.c
>+                        torture/wbc_async.c
>+                        ''',
>                  deps='''
>-                 talloc
>-                 param
>-                 libsmb
>-                 msrpc3
>-                 TLDAP
>-                 RPC_NDR_ECHO
>-                 WB_REQTRANS
>-                 LOCKING
>-                 NDR_OPEN_FILES
>-                 idmap
>-                 IDMAP_TDB_COMMON
>-                 samba-cluster-support
>-                 ''',
>+                      talloc
>+                      param
>+                      libsmb
>+                      msrpc3
>+                      TLDAP
>+                      RPC_NDR_ECHO
>+                      WB_REQTRANS
>+                      LOCKING
>+                      NDR_OPEN_FILES
>+                      idmap
>+                      IDMAP_TDB_COMMON
>+                      samba-cluster-support
>+                      ''',
>                  cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR,
>                  install=False)
> 
>-- 
>2.10.2
>
>
>From cc23c3d1db18e8283478720d01bad0d9108eb5c1 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:02:27 +0100
>Subject: [PATCH 48/61] s3:waf: Reformat smbconftort
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 440cdca..7f9443f 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1227,9 +1227,10 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
> bld.SAMBA3_BINARY('smbconftort',
>                  source='lib/smbconf/testsuite.c',
>                  deps='''
>-                 talloc
>-                 param
>-                 popt_samba3''',
>+                      talloc
>+                      param
>+                      popt_samba3
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('replacetort',
>-- 
>2.10.2
>
>
>From 25cb5547b9448a1fb341b3c567fa54d9705763a7 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:02:48 +0100
>Subject: [PATCH 49/61] s3:waf: Reformat msgtest
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 7f9443f..94da18f 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1241,8 +1241,9 @@ bld.SAMBA3_BINARY('replacetort',
> bld.SAMBA3_BINARY('msgtest',
>                  source='torture/msgtest.c',
>                  deps='''
>-                 talloc
>-                 param''',
>+                      talloc
>+                      param
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('msg_sink',
>-- 
>2.10.2
>
>
>From 71836f8452050110e926d013d0d4df76fddeca93 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:03:02 +0100
>Subject: [PATCH 50/61] s3:waf: Reformat msg_sink
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 94da18f..1641bb7 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1249,8 +1249,9 @@ bld.SAMBA3_BINARY('msgtest',
> bld.SAMBA3_BINARY('msg_sink',
>                  source='torture/msg_sink.c',
>                  deps='''
>-                 talloc
>-                 param''',
>+                      talloc
>+                      param
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('msg_source',
>-- 
>2.10.2
>
>
>From 4ab57038d2f1fe8ff880cfdf5cef8695181bdedd Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:03:22 +0100
>Subject: [PATCH 51/61] s3:waf: Reformat msg_source
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 1641bb7..7b06f7c 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1257,8 +1257,9 @@ bld.SAMBA3_BINARY('msg_sink',
> bld.SAMBA3_BINARY('msg_source',
>                  source='torture/msg_source.c',
>                  deps='''
>-                 talloc
>-                 param''',
>+                      talloc
>+                      param
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('pdbtest',
>-- 
>2.10.2
>
>
>From 997539ab479e14ca869cb2b01cd784bfe8e05760 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:03:50 +0100
>Subject: [PATCH 52/61] s3:waf: Reformat pdbtest
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 7b06f7c..11fc313 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1265,11 +1265,12 @@ bld.SAMBA3_BINARY('msg_source',
> bld.SAMBA3_BINARY('pdbtest',
>                  source='torture/pdbtest.c',
>                  deps='''
>-                 talloc
>-                 pdb
>-                 popt_samba3
>-                 AUTH_COMMON
>-                 auth''',
>+                      talloc
>+                      pdb
>+                      popt_samba3
>+                      AUTH_COMMON
>+                      auth
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('vfstest',
>-- 
>2.10.2
>
>
>From 2f627e19cde34cca4a123251a39ef9cb2a5b5be8 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:04:14 +0100
>Subject: [PATCH 53/61] s3:waf: Reformat vfstest
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 11fc313..6410488 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1274,13 +1274,16 @@ bld.SAMBA3_BINARY('pdbtest',
>                  install=False)
> 
> bld.SAMBA3_BINARY('vfstest',
>-                 source='''torture/cmd_vfs.c
>-                 torture/vfstest.c
>-                 torture/vfstest_chain.c''',
>+                 source='''
>+                        torture/cmd_vfs.c
>+                        torture/vfstest.c
>+                        torture/vfstest_chain.c
>+                        ''',
>                  deps='''
>-                 vfs
>-                 popt_samba3
>-                 SMBREADLINE''',
>+                      vfs
>+                      popt_samba3
>+                      SMBREADLINE
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('versiontest',
>-- 
>2.10.2
>
>
>From 9322c71a0c98ecfea5af79d47accef5c087e6252 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:04:30 +0100
>Subject: [PATCH 54/61] s3:waf: Reformat versiontest
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 6410488..19643e8 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1289,8 +1289,9 @@ bld.SAMBA3_BINARY('vfstest',
> bld.SAMBA3_BINARY('versiontest',
>                  source='lib/version_test.c',
>                  deps='''
>-                 SAMBA_VERSION
>-                 param''',
>+                      SAMBA_VERSION
>+                      param
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('timelimit',
>-- 
>2.10.2
>
>
>From c705f9f83b037488660a3d5bcebb1ae2e4d0a719 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:04:47 +0100
>Subject: [PATCH 55/61] s3:waf: Reformat rpc_open_tcp
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 19643e8..94832a6 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1301,8 +1301,9 @@ bld.SAMBA3_BINARY('timelimit',
> bld.SAMBA3_BINARY('rpc_open_tcp',
>                  source='torture/rpc_open_tcp.c',
>                  deps='''
>-                 talloc
>-                 msrpc3''',
>+                      talloc
>+                      msrpc3
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_BINARY('vlp',
>-- 
>2.10.2
>
>
>From 9403d0d40d7b505237dad297388aa3775d435ab5 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:04:59 +0100
>Subject: [PATCH 56/61] s3:waf: Reformat vlp
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 94832a6..36a3cc2 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -1309,8 +1309,9 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
> bld.SAMBA3_BINARY('vlp',
>                  source='printing/tests/vlp.c',
>                  deps='''
>-                 talloc
>-                 param''',
>+                      talloc
>+                      param
>+                      ''',
>                  install=False)
> 
> bld.SAMBA3_PYTHON('pysmbd',
>-- 
>2.10.2
>
>
>From 81a1eabb37c2f46004b0a0b0b0355cd76310b9a2 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:09:42 +0100
>Subject: [PATCH 57/61] s3:waf: Move popt_samba3 up in the stack
>
>Only daemons and client directly need to link against it.
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 36a3cc2..0821566 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -738,7 +738,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
>                         vfs_default
>                         vfs_posixacl
>                         inotify
>-                        popt_samba3
>                         samba3core
>                         smbd_conn
>                         param_service
>@@ -1092,6 +1091,7 @@ bld.SAMBA3_SUBSYSTEM('SPOOLSSD',
> bld.SAMBA3_BINARY('smbd/smbd',
>                  source='smbd/server.c smbd/smbd_cleanupd.c',
>                  deps='''
>+                      popt_samba3
>                       smbd_base
>                       EPMD
>                       LSASD
>-- 
>2.10.2
>
>
>From 6c827d0ee140aa5f8eaf4e2a06050cc77895c25f Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:18:40 +0100
>Subject: [PATCH 58/61] s3:waf: Move cbuf functions to samba3-util
>
>This is used more commonly in the meantime and this way we avoid linking
>to smbconf.
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 0821566..a14ffcc 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -257,7 +257,6 @@ bld.SAMBA3_LIBRARY('smbregistry',
>                           lib/util_nttoken.c
>                           registry/reg_backend_db.c
>                           registry/reg_parse_internal.c
>-                          lib/cbuf.c
>                           lib/srprs.c
>                           registry/reg_init_basic.c
>                           ''',
>@@ -983,6 +982,7 @@ bld.SAMBA3_LIBRARY('samba3-util',
>                           lib/util_malloc.c
>                           lib/namearray.c
>                           lib/file_id.c
>+                          lib/cbuf.c
>                           ''',
>                    deps='''
>                         samba-util
>-- 
>2.10.2
>
>
>From 5b048b2ec8b00a1e16a63bdce801eef2d0b6b01e Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 11:50:04 +0100
>Subject: [PATCH 59/61] s3:waf samba3util requires CHARSET3
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/wscript_build | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a14ffcc..38974ff 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -336,6 +336,7 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
>                           lib/sock_exec.c
>                           ''',
>                    deps='''
>+                        CHARSET3
>                         ndr
>                         LIBTSOCKET
>                         samba-security
>-- 
>2.10.2
>
>
>From bc43c02543217e22fd03cc998cd71f403e8babd1 Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 13:45:50 +0100
>Subject: [PATCH 60/61] s4:waf: Remove unneded dependency to s3 param
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source4/dsdb/wscript_build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
>index d569ea6..97e4207 100755
>--- a/source4/dsdb/wscript_build
>+++ b/source4/dsdb/wscript_build
>@@ -39,7 +39,7 @@ bld.SAMBA_MODULE('service_drepl',
> 
> bld.SAMBA_LIBRARY('dsdb_garbage_collect_tombstones',
>                   source='kcc/garbage_collect_tombstones.c',
>-                  deps='samdb param RPC_NDR_DRSUAPI',
>+                  deps='samdb RPC_NDR_DRSUAPI',
>                   private_library=True)
> 
> bld.SAMBA_MODULE('service_kcc',
>-- 
>2.10.2
>
>
>From dde5ee7b84e2f2d76354a927683878867e0c77ab Mon Sep 17 00:00:00 2001
>From: Andreas Schneider <asn@samba.org>
>Date: Tue, 22 Nov 2016 13:47:32 +0100
>Subject: [PATCH 61/61] s3:waf: Add PARAM and SMBREGISTRY need to linked into
> smbconf
>
>This is the only way to resolve cirular dependencies with libraries.
>I've tried seveal ways but this is the only way to do it correctly.
>
>Signed-off-by: Andreas Schneider <asn@samba.org>
>---
> source3/libsmb/wscript             |  2 +-
> source3/nmbd/wscript_build         |  2 +-
> source3/param/wscript_build        |  8 ++--
> source3/rpcclient/wscript_build    |  2 +-
> source3/smbd/notifyd/wscript_build |  4 +-
> source3/utils/wscript_build        | 22 ++++-----
> source3/winbindd/wscript_build     |  2 +-
> source3/wscript_build              | 95 +++++++++++++++++++-------------------
> 8 files changed, 69 insertions(+), 68 deletions(-)
>
>diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript
>index 4f8b217..6d862f7 100644
>--- a/source3/libsmb/wscript
>+++ b/source3/libsmb/wscript
>@@ -19,7 +19,7 @@ def build(bld):
>                               libsmb_setget.c''',
>                        public_deps='''
>                                    talloc
>-                                   param
>+                                   smbconf
>                                    libsmb
>                                    KRBCLIENT
>                                    msrpc3
>diff --git a/source3/nmbd/wscript_build b/source3/nmbd/wscript_build
>index 0d1b267..843c900 100644
>--- a/source3/nmbd/wscript_build
>+++ b/source3/nmbd/wscript_build
>@@ -33,7 +33,7 @@ bld.SAMBA3_BINARY('nmbd',
>                  deps='''
>                  talloc
>                  tevent
>-                 param
>+                 smbconf
>                  libsmb
>                  popt_samba3
>                  ''',
>diff --git a/source3/param/wscript_build b/source3/param/wscript_build
>index 6c440f1..c60e917 100644
>--- a/source3/param/wscript_build
>+++ b/source3/param/wscript_build
>@@ -6,7 +6,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
> 
> bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
>                      source='loadparm_ctx.c',
>-                     deps='''talloc param''')
>+                     deps='''talloc smbconf''')
> 
> bld.SAMBA_GENERATOR('s3_param_proto_h',
>                     source= '../../script/generate_param.py ../../docs-xml/smbdotconf/parameters.all.xml',
>@@ -16,18 +16,18 @@ bld.SAMBA_GENERATOR('s3_param_proto_h',
> 
> bld.SAMBA3_PYTHON('pys3param',
>                   source='pyparam.c',
>-                  deps='param',
>+                  deps='smbconf',
>                   public_deps='samba-hostconfig pytalloc-util talloc',
>                   realname='samba/samba3/param.so')
> 
> bld.SAMBA3_SUBSYSTEM('param_service',
>                      source='service.c',
>-                     deps = 'USER_UTIL param PRINTING')
>+                     deps = 'USER_UTIL smbconf PRINTING')
> 
> bld.SAMBA3_BINARY('test_lp_load',
>                  source='test_lp_load.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  popt_samba3''',
>                  install=False)
>diff --git a/source3/rpcclient/wscript_build b/source3/rpcclient/wscript_build
>index 3e8791d..19799a5 100644
>--- a/source3/rpcclient/wscript_build
>+++ b/source3/rpcclient/wscript_build
>@@ -27,7 +27,7 @@ bld.SAMBA3_BINARY('rpcclient',
>                  popt_samba3
>                  pdb
>                  libsmb
>-                 param
>+                 smbconf
>                  ndr-standard
>                  msrpc3
>                  SMBREADLINE
>diff --git a/source3/smbd/notifyd/wscript_build b/source3/smbd/notifyd/wscript_build
>index d9976bd..55cfd88 100644
>--- a/source3/smbd/notifyd/wscript_build
>+++ b/source3/smbd/notifyd/wscript_build
>@@ -8,12 +8,12 @@ bld.SAMBA3_BINARY('notifyd-tests',
>                   source='tests.c',
>                   install=False,
>                   deps='''
>-                    param
>+                       smbconf
>                   ''')
> 
> bld.SAMBA3_BINARY('notifydd',
>                   source='notifydd.c',
>                   install=False,
>                   deps='''notifyd
>-                    param
>+                       smbconf
>                   ''')
>diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build
>index bf94792..0b9356a 100644
>--- a/source3/utils/wscript_build
>+++ b/source3/utils/wscript_build
>@@ -9,14 +9,14 @@ bld.SAMBA3_BINARY('profiles',
>                  deps='''
>                  talloc
>                  popt_samba3
>-                 param
>+                 smbconf
>                  REGFIO''')
> 
> bld.SAMBA3_BINARY('smbcontrol',
>                  source='smbcontrol.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  popt_samba3
>                  PRINTBASE''')
> 
>@@ -24,7 +24,7 @@ bld.SAMBA3_BINARY('smbtree',
>                  source='smbtree.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  libsmb
>                  msrpc3
>                  popt_samba3
>@@ -34,7 +34,7 @@ bld.SAMBA3_BINARY('smbpasswd',
>                  source='smbpasswd.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  pdb
>                  PASSWD_UTIL
>                  PASSCHANGE''')
>@@ -43,7 +43,7 @@ bld.SAMBA3_BINARY('pdbedit',
>                  source='pdbedit.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  popt_samba3
>                  pdb
>                  PASSWD_UTIL''')
>@@ -59,7 +59,7 @@ bld.SAMBA3_BINARY('nmblookup',
>                  source='nmblookup.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  popt_samba3
>                  LIBNMB''')
> 
>@@ -85,7 +85,7 @@ bld.SAMBA3_BINARY('eventlogadm',
>                  source='eventlogadm.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  LIBEVENTLOG''')
> 
> bld.SAMBA3_BINARY('sharesec',
>@@ -110,7 +110,7 @@ bld.SAMBA3_BINARY('smbfilter',
>                  source='smbfilter.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  LIBNMB''',
>                  install=False)
> 
>@@ -149,14 +149,14 @@ bld.SAMBA3_BINARY('samba-regedit',
>                             regedit_wrap.c regedit_treeview.c
>                             regedit_valuelist.c regedit_dialog.c
>                             regedit_hexedit.c regedit_list.c""",
>-                  deps='ncurses menu panel form registry param popt_samba3 smbregistry',
>+                  deps='ncurses menu panel form registry smbconf popt_samba3',
>                   enabled=bld.env.build_regedit)
> 
> bld.SAMBA3_BINARY('testparm',
>                  source='testparm.c',
>                  deps='''
>                  talloc
>-                 param
>+                 smbconf
>                  popt_samba3''')
> 
> bld.SAMBA3_BINARY('net',
>@@ -218,7 +218,7 @@ bld.SAMBA3_BINARY('net',
>                  popt_samba3
>                  pdb
>                  libsmb
>-                 param
>+                 smbconf
>                  KRBCLIENT
>                  ndr-standard
>                  msrpc3
>diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
>index 47c9bb1..3f78093 100644
>--- a/source3/winbindd/wscript_build
>+++ b/source3/winbindd/wscript_build
>@@ -116,7 +116,7 @@ bld.SAMBA3_MODULE('idmap_autorid',
> 
> bld.SAMBA3_LIBRARY('nss_info',
>                    source='nss_info.c',
>-                   deps='samba-util param',
>+                   deps='samba-util smbconf',
>                    private_library=True)
> 
> bld.SAMBA3_MODULE('nss_info_template',
>diff --git a/source3/wscript_build b/source3/wscript_build
>index 38974ff..eedc3f4 100755
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -58,7 +58,7 @@ bld.SAMBA3_LIBRARY('netapi',
> 
> bld.SAMBA3_LIBRARY('gse',
>                    source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
>-                   deps='krb5samba gensec param KRBCLIENT secrets3',
>+                   deps='krb5samba gensec smbconf KRBCLIENT secrets3',
>                    private_library=True)
> 
> bld.SAMBA3_LIBRARY('msrpc3',
>@@ -214,26 +214,6 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
>                      source='lib/server_mutex.c',
>                      deps='talloc')
> 
>-bld.SAMBA3_SUBSYSTEM('param',
>-                   source='''
>-                          param/loadparm.c
>-                          lib/sharesec.c
>-                          lib/ldap_debug_handler.c
>-                          lib/util_names.c
>-                          ''',
>-                   deps='''
>-                        samba-util
>-                        PARAM_UTIL
>-                        ldap
>-                        lber
>-                        LOADPARM_CTX
>-                        samba3core
>-                        smbconf
>-                        param_local.h
>-                        param_global.h
>-                        cups
>-                        ''')
>-
> # this includes only the low level parse code, not stuff
> # that requires knowledge of security contexts
> bld.SAMBA3_SUBSYSTEM('REG_PARSE_PRS',
>@@ -247,7 +227,8 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
>                     source='registry/reg_api_regf.c',
>                     deps='samba-util')
> 
>-bld.SAMBA3_LIBRARY('smbregistry',
>+# Do not link against this use 'smbconf'
>+bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
>                    source='''
>                           registry/reg_api.c
>                           registry/reg_dispatcher.c
>@@ -273,10 +254,9 @@ bld.SAMBA3_LIBRARY('smbregistry',
>                         errors3
>                         dbwrap
>                         samba3-util
>-                        ''',
>-                   allow_undefined_symbols=True,
>-                   private_library=True)
>+                        ''')
> 
>+# Do not link against this use 'smbconf'
> bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
>                     source='''
>                            registry/reg_backend_smbconf.c
>@@ -284,7 +264,7 @@ bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
>                            registry/reg_util_token.c
>                            registry/reg_api_util.c
>                            ''',
>-                    deps='smbregistry')
>+                    deps='SMBREGISTRY')
> 
> bld.SAMBA3_SUBSYSTEM('REG_FULL',
>                     source='''
>@@ -299,7 +279,7 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
>                            registry/reg_init_full.c
>                            registry/reg_perfcount.c''',
>                     deps='''
>-                         REG_SMBCONF
>+                         smbconf
>                          tdb-wrap3
>                          ''')
> 
>@@ -452,7 +432,7 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
>                         SAMBA_VERSION
>                         PTHREADPOOL
>                         interfaces
>-                        param
>+                        smbconf
>                         dbwrap
>                         samba3-util
>                         errors3
>@@ -530,7 +510,7 @@ bld.SAMBA3_LIBRARY('secrets3',
>                           ''',
>                    deps='''
>                         NDR_SECRETS
>-                        param
>+                        smbconf
>                         samba3util
>                         dbwrap
>                         ''',
>@@ -538,7 +518,7 @@ bld.SAMBA3_LIBRARY('secrets3',
> 
> bld.SAMBA3_LIBRARY('smbldap',
>                     source='lib/smbldap.c',
>-                    deps='ldap lber samba-util param',
>+                    deps='ldap lber samba-util smbconf',
>                     enabled=bld.CONFIG_SET("HAVE_LDAP"),
>                     private_library=False,
>                     abi_directory='lib/ABI',
>@@ -569,7 +549,7 @@ bld.SAMBA3_LIBRARY('ads',
>                         ldap
>                         lber
>                         KRBCLIENT
>-                        param
>+                        smbconf
>                         LIBNMB
>                         libsmb
>                         DCUTIL
>@@ -585,6 +565,27 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
>                     source='libads/ldap_printer.c',
>                     deps='samba-util krb5samba')
> 
>+# Only smbconf should link against this subsystem, else we will create
>+# a circular dependency.
>+bld.SAMBA3_SUBSYSTEM('SMBCONF_PARAM',
>+                   source='''
>+                          param/loadparm.c
>+                          lib/sharesec.c
>+                          lib/ldap_debug_handler.c
>+                          lib/util_names.c
>+                          ''',
>+                   deps='''
>+                        samba-util
>+                        PARAM_UTIL
>+                        ldap
>+                        lber
>+                        LOADPARM_CTX
>+                        samba3core
>+                        param_local.h
>+                        param_global.h
>+                        cups
>+                        ''')
>+
> bld.SAMBA3_LIBRARY('smbconf',
>                    source='''
>                           lib/smbconf/smbconf_init.c
>@@ -599,9 +600,8 @@ bld.SAMBA3_LIBRARY('smbconf',
>                         charset
>                         cli_smb_common
>                         errors3
>-                        param
>+                        SMBCONF_PARAM
>                         samba-util
>-                        smbregistry
>                         talloc
>                         util_reg
>                         ''',
>@@ -827,7 +827,7 @@ bld.SAMBA3_LIBRARY('printing_migrate',
>                          cli_spoolss
>                          RPC_NDR_WINREG
>                          LIBCLI_WINREG
>-                         param
>+                         smbconf
>                          ''',
>                     private_library=True)
> 
>@@ -1038,7 +1038,7 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
>                         RPC_NDR_NETLOGON
>                         INIT_NETLOGON
>                         cliauth
>-                        param
>+                        smbconf
>                         NETLOGON_CREDS_CLI''',
>                    private_library=True)
> 
>@@ -1049,7 +1049,7 @@ bld.SAMBA3_LIBRARY('cli_spoolss',
>                           ''',
>                    deps='''
>                         RPC_NDR_SPOOLSS
>-                        param
>+                        smbconf
>                         secrets3''',
>                    private_library=True)
> 
>@@ -1117,7 +1117,7 @@ bld.SAMBA3_BINARY('client/smbclient',
>                  deps='''
>                       talloc
>                       popt_samba3
>-                      param
>+                      smbconf
>                       ndr-standard
>                       SMBREADLINE
>                       libsmb
>@@ -1132,7 +1132,7 @@ bld.SAMBA3_BINARY('smbspool',
>                  deps='''
>                       talloc
>                       popt_samba3
>-                      param
>+                      smbconf
>                       libsmb
>                       samba3core
>                       ''')
>@@ -1150,7 +1150,7 @@ bld.SAMBA3_BINARY('locktest2',
>                  source='torture/locktest2.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       libsmb
>                       LOCKING
>                       ''',
>@@ -1167,7 +1167,7 @@ bld.SAMBA3_BINARY('smbstatus',
>                  source=smbstatus_source,
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       popt_samba3
>                       smbd_base
>                       LOCKING
>@@ -1210,7 +1210,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
>                         ''',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       libsmb
>                       msrpc3
>                       TLDAP
>@@ -1229,7 +1229,7 @@ bld.SAMBA3_BINARY('smbconftort',
>                  source='lib/smbconf/testsuite.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       popt_samba3
>                       ''',
>                  install=False)
>@@ -1243,7 +1243,7 @@ bld.SAMBA3_BINARY('msgtest',
>                  source='torture/msgtest.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       ''',
>                  install=False)
> 
>@@ -1251,7 +1251,7 @@ bld.SAMBA3_BINARY('msg_sink',
>                  source='torture/msg_sink.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       ''',
>                  install=False)
> 
>@@ -1259,7 +1259,7 @@ bld.SAMBA3_BINARY('msg_source',
>                  source='torture/msg_source.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       ''',
>                  install=False)
> 
>@@ -1283,6 +1283,7 @@ bld.SAMBA3_BINARY('vfstest',
>                  deps='''
>                       vfs
>                       popt_samba3
>+                      smbconf
>                       SMBREADLINE
>                       ''',
>                  install=False)
>@@ -1291,7 +1292,7 @@ bld.SAMBA3_BINARY('versiontest',
>                  source='lib/version_test.c',
>                  deps='''
>                       SAMBA_VERSION
>-                      param
>+                      smbconf
>                       ''',
>                  install=False)
> 
>@@ -1311,7 +1312,7 @@ bld.SAMBA3_BINARY('vlp',
>                  source='printing/tests/vlp.c',
>                  deps='''
>                       talloc
>-                      param
>+                      smbconf
>                       ''',
>                  install=False)
> 
>-- 
>2.10.2
>

Actions: View

Attachments on bug 12450: 12696 | 12697 | 12721 | 12722