[PATCHSET] tidy up source3/wscript_build
Michael Adam
obnox at samba.org
Mon Sep 23 10:29:58 CEST 2013
Here is the next set of patches:
cleaning up source3/wscript_build:
- removing all variables for source file collections
- thereby also reorganizing a few
- removing all occurrences of vars=locals()
please review/comment/push as found appropriate.
This can also be found in my master-build branch:
http://gitweb.samba.org/?p=obnox/samba/samba-obnox.git;a=shortlog;h=master-build
(skip the top two patches marked "TODO")
Next I will look over other source3 wscript_build files
and start to reorganize the subsystems/libs more.
Cheers - Michael
On 2013-09-23 at 08:16 +0200, Michael Adam wrote:
> On 2013-09-22 at 19:51 -0700, Andrew Bartlett wrote:
> > On Mon, 2013-09-23 at 04:37 +0200, Michael Adam wrote:
> > > attached find a patchset that tidies up source3/winbindd/wscript_build a bit:
> > > [...]
> > > Please review/comment/push as appropriate.
> >
> > Reviewed-by: Andrew Bartlett <abartlet at samba.org>
>
> Pushed to autobuild.
-------------- next part --------------
From 8c094c420e1da44bdc71030dd19d1819b7d58fed Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 01:55:09 +0200
Subject: [PATCH 001/101] build: fix spacing in definition of "idmap_ldap"
module
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/winbindd/wscript_build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 1c957e5..b318bec 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -64,7 +64,7 @@ bld.SAMBA3_MODULE('idmap_ldap',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.CONFIG_SET("HAVE_LDAP"),
- allow_undefined_symbols=True)
+ allow_undefined_symbols=True)
bld.SAMBA3_MODULE('idmap_nss',
subsystem='idmap',
--
1.7.9.5
From 3a6cba614930d56765a3874b0c2895338f087d43 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 01:58:47 +0200
Subject: [PATCH 002/101] build: list sources directly in the netapi library
and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 37 ++++++++++++++++---------------------
1 file changed, 16 insertions(+), 21 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index d80391c..4982b3b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -461,24 +461,6 @@ LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
- lib/netapi/cm.c
- lib/netapi/libnetapi.c
- lib/netapi/joindomain.c
- lib/netapi/serverinfo.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'''
-
-LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}'''
-
CLIENT_SRC = '''
client/client.c
client/clitar.c
@@ -626,7 +608,21 @@ bld.SETUP_BUILD_GROUPS()
######################## SUBSYSTEMS #################################
bld.SAMBA3_LIBRARY('netapi',
- source=LIBNETAPI_SRC,
+ source='''lib/netapi/netapi.c
+ lib/netapi/cm.c
+ lib/netapi/libnetapi.c
+ lib/netapi/joindomain.c
+ lib/netapi/serverinfo.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
@@ -642,8 +638,7 @@ bld.SAMBA3_LIBRARY('netapi',
''',
public_headers='../source3/lib/netapi/netapi.h',
pc_files='libnet/netapi.pc',
- vnum='0',
- vars=locals())
+ vnum='0')
bld.SAMBA3_LIBRARY('smbsharemodes',
source=LIBSMBSHAREMODES_SRC,
--
1.7.9.5
From 9720e1baa32edfea3a12de5042df0889c91e7cbc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:00:56 +0200
Subject: [PATCH 003/101] build: list sources of smbclient directly in the
definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 4982b3b..cee120c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -461,11 +461,6 @@ LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-CLIENT_SRC = '''
- client/client.c
- client/clitar.c
- client/dnsbrowse.c'''
-
LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
@@ -1247,7 +1242,9 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
vars=locals())
bld.SAMBA3_BINARY('client/smbclient',
- source=CLIENT_SRC,
+ source='''client/client.c
+ client/clitar.c
+ client/dnsbrowse.c''',
deps='''
talloc
popt_samba3
--
1.7.9.5
From 7310f183713e6bdf60d9e11d2ac4835b19c6ca84 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:08:49 +0200
Subject: [PATCH 004/101] build: list sources of nmbd directly in the
definition and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 31 +++++++++++++------------------
1 file changed, 13 insertions(+), 18 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index cee120c..c27b24c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -407,21 +407,6 @@ PRINTBACKEND_SRC = '''printing/printing.c
printing/nt_printing_ads.c
printing/queue_process.c'''
-NMBD_SRC1 = '''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
- nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
- nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
- nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
- nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
- nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
- nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
- nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
- nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
- nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
- nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
- nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c'''
-
-NMBD_SRC = '${NMBD_SRC1}'
-
STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -1170,7 +1155,18 @@ bld.SAMBA3_BINARY('smbd/smbd',
vars=locals())
bld.SAMBA3_BINARY('nmbd/nmbd',
- source=NMBD_SRC,
+ source='''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
+ nmbd/nmbd_become_lmb.c nmbd/nmbd_browserdb.c
+ nmbd/nmbd_browsesync.c nmbd/nmbd_elections.c
+ nmbd/nmbd_incomingdgrams.c nmbd/nmbd_incomingrequests.c
+ nmbd/nmbd_lmhosts.c nmbd/nmbd_logonnames.c nmbd/nmbd_mynames.c
+ nmbd/nmbd_namelistdb.c nmbd/nmbd_namequery.c
+ nmbd/nmbd_nameregister.c nmbd/nmbd_namerelease.c
+ nmbd/nmbd_nodestatus.c nmbd/nmbd_packets.c
+ nmbd/nmbd_processlogon.c nmbd/nmbd_responserecordsdb.c
+ nmbd/nmbd_sendannounce.c nmbd/nmbd_serverlistdb.c
+ nmbd/nmbd_subnetdb.c nmbd/nmbd_winsproxy.c nmbd/nmbd_winsserver.c
+ nmbd/nmbd_workgroupdb.c nmbd/nmbd_synclists.c''',
deps='''
talloc
tevent
@@ -1178,8 +1174,7 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
libsmb
popt_samba3
PROFILE''',
- install_path='${SBINDIR}',
- vars=locals())
+ install_path='${SBINDIR}')
bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
--
1.7.9.5
From eb68c6f48ed55a58b5f9585db38059ca89a099de Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:14:15 +0200
Subject: [PATCH 005/101] build: list sources directly in smbldap library and
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index c27b24c..a5e2868 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -11,8 +11,6 @@ TDB_LIB_SRC = '''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-SMBLDAP_SRC = '''lib/smbldap.c'''
-
VERSION_SRC = '''lib/version.c'''
AFS_SRC = 'lib/afs.c'
@@ -866,9 +864,8 @@ bld.SAMBA3_LIBRARY('secrets3',
vars=locals())
bld.SAMBA3_LIBRARY('smbldap',
- source=SMBLDAP_SRC,
+ source='lib/smbldap.c',
deps='ldap lber samba-util param',
- vars=locals(),
enabled=bld.CONFIG_SET("HAVE_LDAP"),
private_library=False,
abi_directory='lib/ABI',
--
1.7.9.5
From ba706195c6bc3958498ebcb673de6ac41c2a7d53 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:15:16 +0200
Subject: [PATCH 006/101] build: list sources directly in definition of
SAMBA_VERSION, and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index a5e2868..f5b2965 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -11,8 +11,6 @@ TDB_LIB_SRC = '''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-VERSION_SRC = '''lib/version.c'''
-
AFS_SRC = 'lib/afs.c'
AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
@@ -1054,9 +1052,8 @@ bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
vars=locals())
bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
- source=VERSION_SRC,
- deps='samba-util',
- vars=locals())
+ source='lib/version.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
--
1.7.9.5
From 1250f967b6fa6b952043574c3411ba2b66d4b6f5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:16:47 +0200
Subject: [PATCH 007/101] build: list sources directly in the definition of
LIBAFS subsystem and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f5b2965..7df8fd1 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -11,8 +11,6 @@ TDB_LIB_SRC = '''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-AFS_SRC = 'lib/afs.c'
-
AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
@@ -889,9 +887,8 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBAFS',
- source=AFS_SRC,
- deps='samba-util',
- vars=locals())
+ source='lib/afs.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
source=AFS_SETTOKEN_SRC,
--
1.7.9.5
From f18b511e9542d34bedc348f4cb59255e4a2a604f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:18:11 +0200
Subject: [PATCH 008/101] build: list sources directly in def of
LIBAFS_SETTOKEN subsystem and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 7df8fd1..7dbbee0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -11,8 +11,6 @@ TDB_LIB_SRC = '''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-AFS_SETTOKEN_SRC = 'lib/afs_settoken.c'
-
AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
SERVER_MUTEX_SRC = 'lib/server_mutex.c'
@@ -891,9 +889,8 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
- source=AFS_SETTOKEN_SRC,
- deps='samba-util',
- vars=locals())
+ source='lib/afs_settoken.c',
+ deps='samba-util')
bld.SAMBA3_LIBRARY('smbconf',
source=LIB_SMBCONF_SRC,
--
1.7.9.5
From 09b01e253262adbb311efa724d4b5b1bd2c69093 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:35:58 +0200
Subject: [PATCH 009/101] afs: format afs_syscall() properly
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/include/proto.h | 6 +-----
source3/lib/afs_settoken.c | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 804575a..8462bf7 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -45,11 +45,7 @@ char *afs_createtoken_str(const char *username, const char *cell);
/* The following definitions come from lib/afs_settoken.c */
-int afs_syscall( int subcall,
- const char * path,
- int cmd,
- char * cmarg,
- int follow);
+int afs_syscall(int subcall, const char *path, int cmd, char *cmarg, int follow);
bool afs_settoken_str(const char *token_string);
bool afs_settoken_str(const char *token_string);
diff --git a/source3/lib/afs_settoken.c b/source3/lib/afs_settoken.c
index 77d9ace..af15fa8 100644
--- a/source3/lib/afs_settoken.c
+++ b/source3/lib/afs_settoken.c
@@ -34,11 +34,7 @@
#include <openssl/des.h>
#include <sys/syscall.h>
-int afs_syscall( int subcall,
- const char * path,
- int cmd,
- char * cmarg,
- int follow)
+int afs_syscall(int subcall, const char *path, int cmd, char *cmarg, int follow)
{
/*
return( syscall( SYS_afs_syscall, subcall, path, cmd, cmarg, follow));
--
1.7.9.5
From 1edb17c72c8e6427139728128e5fbb626a4317e0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:36:28 +0200
Subject: [PATCH 010/101] afs: implement afs_syscall() always, returning -1 if
FAKE_KASERVER is not defined.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/lib/afs_settoken.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/source3/lib/afs_settoken.c b/source3/lib/afs_settoken.c
index af15fa8..5d55fb0 100644
--- a/source3/lib/afs_settoken.c
+++ b/source3/lib/afs_settoken.c
@@ -248,6 +248,11 @@ bool afs_settoken_str(const char *token_string)
#else
+int afs_syscall(int subcall, const char *path, int cmd, char *cmarg, int follow)
+{
+ return -1;
+}
+
bool afs_settoken_str(const char *token_string)
{
return false;
--
1.7.9.5
From 0d90dfc9159975b398616a98812ee3f98e10c883 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:37:16 +0200
Subject: [PATCH 011/101] s3:include: remove duplicate prototypes from afs
functions from proto.h
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/include/proto.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8462bf7..023fbd0 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -40,14 +40,11 @@ bool allow_access(const char **deny_list,
char *afs_createtoken_str(const char *username, const char *cell);
bool afs_login(connection_struct *conn);
-bool afs_login(connection_struct *conn);
-char *afs_createtoken_str(const char *username, const char *cell);
/* The following definitions come from lib/afs_settoken.c */
int afs_syscall(int subcall, const char *path, int cmd, char *cmarg, int follow);
bool afs_settoken_str(const char *token_string);
-bool afs_settoken_str(const char *token_string);
/* The following definitions come from lib/audit.c */
--
1.7.9.5
From dc3de0ed0fe9c9205b3b6384f7d8b82d70b8031e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:38:15 +0200
Subject: [PATCH 012/101] build: LIBAFS depends on LIBAFS_SETTOKEN
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 7dbbee0..74c1aaa 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -884,14 +884,14 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
deps='samba-util krb5samba',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('LIBAFS',
- source='lib/afs.c',
- deps='samba-util')
-
bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
source='lib/afs_settoken.c',
deps='samba-util')
+bld.SAMBA3_SUBSYSTEM('LIBAFS',
+ source='lib/afs.c',
+ deps='samba-util LIBAFS_SETTOKEN')
+
bld.SAMBA3_LIBRARY('smbconf',
source=LIB_SMBCONF_SRC,
deps='''
@@ -938,7 +938,6 @@ bld.SAMBA3_LIBRARY('smbd_base',
LOCKING
LIBADS_SERVER
LIBAFS
- LIBAFS_SETTOKEN
RPC_SERVER
NDR_SMBXSRV
LIBASYS
--
1.7.9.5
From 8c81bdb53915fcb0defd920bd7f0d8969f0e5922 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:50:19 +0200
Subject: [PATCH 013/101] build: make TDB_VALIDATE its own subsystem and have
winbindd depend on it
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 74c1aaa..17ee6fb 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -9,8 +9,6 @@ TDB_LIB_SRC = '''
lib/dbwrap/dbwrap_watch.c
lib/g_lock.c'''
-TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-
AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
SERVER_MUTEX_SRC = 'lib/server_mutex.c'
@@ -316,8 +314,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_pam_auth_crap.c
winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
-WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${TDB_VALIDATE_SRC}'''
+WINBINDD_SRC = '''${WINBINDD_SRC1}'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -1163,6 +1160,12 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
PROFILE''',
install_path='${SBINDIR}')
+
+bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
+ source='lib/tdb_validate.c',
+ deps='samba-util')
+
+
bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''
@@ -1186,6 +1189,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
RPC_NCACN_NP
RPC_PIPE_REGISTER
WB_REQTRANS
+ TDB_VALIDATE
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',
--
1.7.9.5
From eccea9ab56acec92fef0349f2a625cb48db2dfb4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 02:55:56 +0200
Subject: [PATCH 014/101] build: list winbindd sources in definition and
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 177 ++++++++++++++++++++++++-------------------------
1 file changed, 86 insertions(+), 91 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 17ee6fb..b4528be 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -228,94 +228,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
-WINBINDD_SRC1 = '''winbindd/winbindd.c
- winbindd/winbindd_group.c
- winbindd/winbindd_util.c
- winbindd/winbindd_cache.c
- winbindd/winbindd_pam.c
- winbindd/winbindd_misc.c
- winbindd/winbindd_cm.c
- winbindd/winbindd_wins_byip.c
- winbindd/winbindd_wins_byname.c
- winbindd/winbindd_msrpc.c
- winbindd/winbindd_rpc.c
- winbindd/winbindd_reconnect.c
- winbindd/winbindd_ads.c
- winbindd/winbindd_samr.c
- winbindd/winbindd_dual.c
- winbindd/winbindd_dual_ndr.c
- winbindd/winbindd_dual_srv.c
- winbindd/winbindd_async.c
- winbindd/winbindd_creds.c
- winbindd/winbindd_cred_cache.c
- winbindd/winbindd_ccache_access.c
- winbindd/winbindd_domain.c
- winbindd/winbindd_idmap.c
- winbindd/winbindd_locator.c
- winbindd/winbindd_ndr.c
- winbindd/wb_ping.c
- winbindd/wb_lookupsid.c
- winbindd/wb_lookupsids.c
- winbindd/wb_lookupname.c
- winbindd/wb_uid2sid.c
- winbindd/wb_gid2sid.c
- winbindd/wb_sids2xids.c
- winbindd/wb_queryuser.c
- winbindd/wb_lookupuseraliases.c
- winbindd/wb_lookupusergroups.c
- winbindd/wb_getpwsid.c
- winbindd/wb_gettoken.c
- winbindd/wb_seqnum.c
- winbindd/wb_seqnums.c
- winbindd/wb_group_members.c
- winbindd/wb_getgrsid.c
- winbindd/wb_query_user_list.c
- winbindd/wb_fill_pwent.c
- winbindd/wb_next_pwent.c
- winbindd/wb_next_grent.c
- winbindd/wb_dsgetdcname.c
- winbindd/winbindd_lookupsid.c
- winbindd/winbindd_lookupsids.c
- winbindd/winbindd_lookupname.c
- winbindd/winbindd_sid_to_uid.c
- winbindd/winbindd_sid_to_gid.c
- winbindd/winbindd_uid_to_sid.c
- winbindd/winbindd_gid_to_sid.c
- winbindd/winbindd_sids_to_xids.c
- winbindd/winbindd_allocate_uid.c
- winbindd/winbindd_allocate_gid.c
- winbindd/winbindd_getpwsid.c
- winbindd/winbindd_getpwnam.c
- winbindd/winbindd_getpwuid.c
- winbindd/winbindd_getsidaliases.c
- winbindd/winbindd_getuserdomgroups.c
- winbindd/winbindd_getgroups.c
- winbindd/winbindd_show_sequence.c
- winbindd/winbindd_getgrgid.c
- winbindd/winbindd_getgrnam.c
- winbindd/winbindd_getusersids.c
- winbindd/winbindd_lookuprids.c
- winbindd/winbindd_setpwent.c
- winbindd/winbindd_getpwent.c
- winbindd/winbindd_endpwent.c
- winbindd/winbindd_setgrent.c
- winbindd/winbindd_getgrent.c
- winbindd/winbindd_endgrent.c
- winbindd/winbindd_dsgetdcname.c
- winbindd/winbindd_getdcname.c
- winbindd/winbindd_list_users.c
- winbindd/winbindd_list_groups.c
- winbindd/winbindd_check_machine_acct.c
- winbindd/winbindd_change_machine_acct.c
- winbindd/winbindd_ping_dc.c
- winbindd/winbindd_pam_auth.c
- winbindd/winbindd_pam_logoff.c
- winbindd/winbindd_pam_chauthtok.c
- winbindd/winbindd_pam_auth_crap.c
- winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
-
-WINBINDD_SRC = '''${WINBINDD_SRC1}'''
-
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
SMBD_SRC_MAIN = '''smbd/server.c'''
@@ -1167,7 +1079,91 @@ bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
bld.SAMBA3_BINARY('winbindd/winbindd',
- source=WINBINDD_SRC,
+ source='''winbindd/winbindd.c
+ winbindd/winbindd_group.c
+ winbindd/winbindd_util.c
+ winbindd/winbindd_cache.c
+ winbindd/winbindd_pam.c
+ winbindd/winbindd_misc.c
+ winbindd/winbindd_cm.c
+ winbindd/winbindd_wins_byip.c
+ winbindd/winbindd_wins_byname.c
+ winbindd/winbindd_msrpc.c
+ winbindd/winbindd_rpc.c
+ winbindd/winbindd_reconnect.c
+ winbindd/winbindd_ads.c
+ winbindd/winbindd_samr.c
+ winbindd/winbindd_dual.c
+ winbindd/winbindd_dual_ndr.c
+ winbindd/winbindd_dual_srv.c
+ winbindd/winbindd_async.c
+ winbindd/winbindd_creds.c
+ winbindd/winbindd_cred_cache.c
+ winbindd/winbindd_ccache_access.c
+ winbindd/winbindd_domain.c
+ winbindd/winbindd_idmap.c
+ winbindd/winbindd_locator.c
+ winbindd/winbindd_ndr.c
+ winbindd/wb_ping.c
+ winbindd/wb_lookupsid.c
+ winbindd/wb_lookupsids.c
+ winbindd/wb_lookupname.c
+ winbindd/wb_uid2sid.c
+ winbindd/wb_gid2sid.c
+ winbindd/wb_sids2xids.c
+ winbindd/wb_queryuser.c
+ winbindd/wb_lookupuseraliases.c
+ winbindd/wb_lookupusergroups.c
+ winbindd/wb_getpwsid.c
+ winbindd/wb_gettoken.c
+ winbindd/wb_seqnum.c
+ winbindd/wb_seqnums.c
+ winbindd/wb_group_members.c
+ winbindd/wb_getgrsid.c
+ winbindd/wb_query_user_list.c
+ winbindd/wb_fill_pwent.c
+ winbindd/wb_next_pwent.c
+ winbindd/wb_next_grent.c
+ winbindd/wb_dsgetdcname.c
+ winbindd/winbindd_lookupsid.c
+ winbindd/winbindd_lookupsids.c
+ winbindd/winbindd_lookupname.c
+ winbindd/winbindd_sid_to_uid.c
+ winbindd/winbindd_sid_to_gid.c
+ winbindd/winbindd_uid_to_sid.c
+ winbindd/winbindd_gid_to_sid.c
+ winbindd/winbindd_sids_to_xids.c
+ winbindd/winbindd_allocate_uid.c
+ winbindd/winbindd_allocate_gid.c
+ winbindd/winbindd_getpwsid.c
+ winbindd/winbindd_getpwnam.c
+ winbindd/winbindd_getpwuid.c
+ winbindd/winbindd_getsidaliases.c
+ winbindd/winbindd_getuserdomgroups.c
+ winbindd/winbindd_getgroups.c
+ winbindd/winbindd_show_sequence.c
+ winbindd/winbindd_getgrgid.c
+ winbindd/winbindd_getgrnam.c
+ winbindd/winbindd_getusersids.c
+ winbindd/winbindd_lookuprids.c
+ winbindd/winbindd_setpwent.c
+ winbindd/winbindd_getpwent.c
+ winbindd/winbindd_endpwent.c
+ winbindd/winbindd_setgrent.c
+ winbindd/winbindd_getgrent.c
+ winbindd/winbindd_endgrent.c
+ winbindd/winbindd_dsgetdcname.c
+ winbindd/winbindd_getdcname.c
+ winbindd/winbindd_list_users.c
+ winbindd/winbindd_list_groups.c
+ winbindd/winbindd_check_machine_acct.c
+ winbindd/winbindd_change_machine_acct.c
+ winbindd/winbindd_ping_dc.c
+ winbindd/winbindd_pam_auth.c
+ winbindd/winbindd_pam_logoff.c
+ winbindd/winbindd_pam_chauthtok.c
+ winbindd/winbindd_pam_auth_crap.c
+ winbindd/winbindd_pam_chng_pswd_auth_crap.c''',
deps='''
talloc
tevent
@@ -1192,8 +1188,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
TDB_VALIDATE
''',
enabled=bld.env.build_winbind,
- install_path='${SBINDIR}',
- vars=locals())
+ install_path='${SBINDIR}')
bld.SAMBA3_BINARY('rpcclient/rpcclient',
source=RPCCLIENT_SRC,
--
1.7.9.5
From 56328138916bb1c42a8fa8381ee0485e87dd6137 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:34:48 +0200
Subject: [PATCH 015/101] build: define a subsystem TDB_LIB from TDB_LIB_SRC
and depend on in sin samba3core
This also allows us to remove vars=locals() from samba3core.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b4528be..2553223 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,12 +3,6 @@
from samba_utils import *
import samba_version, samba3
-TDB_LIB_SRC = '''
- lib/dbwrap/dbwrap_open.c
- lib/dbwrap/dbwrap_ctdb.c
- lib/dbwrap/dbwrap_watch.c
- lib/g_lock.c'''
-
AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
SERVER_MUTEX_SRC = 'lib/server_mutex.c'
@@ -37,7 +31,6 @@ LIB_SRC = '''
lib/talloc_dict.c
lib/serverid.c
lib/addrchange.c
- ${TDB_LIB_SRC}
../lib/util/debug_s3.c
lib/dumpcore.c
lib/interface.c
@@ -704,6 +697,14 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
vars=locals())
+
+bld.SAMBA3_SUBSYSTEM('TDB_LIB',
+ source='''lib/dbwrap/dbwrap_open.c
+ lib/dbwrap/dbwrap_ctdb.c
+ lib/dbwrap/dbwrap_watch.c
+ lib/g_lock.c''',
+ deps='dbwrap')
+
bld.SAMBA3_SUBSYSTEM('samba3core',
source=LIB_SRC,
deps='''
@@ -718,8 +719,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
param
dbwrap
samba3-util
- errors3''',
- vars=locals())
+ errors3
+ TDB_LIB''')
bld.SAMBA3_LIBRARY('smbd_shim',
source='''lib/smbd_shim.c''',
--
1.7.9.5
From 1a3fc313266533b257194d76e8f42f9eee254bc3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:37:45 +0200
Subject: [PATCH 016/101] build: list LIB_SRC files directly in samba3core.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 68 ++++++++++++++++++++++++++-----------------------
1 file changed, 36 insertions(+), 32 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 2553223..38ea41e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -22,37 +22,6 @@ LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-LIB_SRC = '''
- lib/messages.c lib/messages_local.c
- lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
- lib/ctdb_conn.c
- lib/msg_channel.c
- lib/id_cache.c
- lib/talloc_dict.c
- lib/serverid.c
- lib/addrchange.c
- ../lib/util/debug_s3.c
- lib/dumpcore.c
- lib/interface.c
- lib/username.c
- lib/access.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/events.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_UTIL_SRC = '''
lib/system.c
lib/sendfile.c
@@ -706,7 +675,42 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
deps='dbwrap')
bld.SAMBA3_SUBSYSTEM('samba3core',
- source=LIB_SRC,
+ source='''lib/messages.c
+ lib/messages_local.c
+ lib/messages_ctdbd.c
+ lib/ctdb_packet.c
+ lib/ctdbd_conn.c
+ lib/ctdb_conn.c
+ lib/msg_channel.c
+ lib/id_cache.c
+ lib/talloc_dict.c
+ lib/serverid.c
+ lib/addrchange.c
+ ../lib/util/debug_s3.c
+ lib/dumpcore.c
+ lib/interface.c
+ lib/username.c
+ lib/access.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/events.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''',
deps='''
samba3util
LIBTSOCKET
--
1.7.9.5
From cbcb0c282a2a1624b23512e0d595ddf351b81d3a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:38:45 +0200
Subject: [PATCH 017/101] build: list source of subsystem AVAHI directly in
its definition.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 38ea41e..9276eb3 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
-
SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
@@ -521,7 +519,7 @@ bld.SAMBA3_LIBRARY('gpo',
private_library=True)
bld.SAMBA3_SUBSYSTEM('AVAHI',
- source=AVAHI_SRC,
+ source='lib/avahi.c smbd/avahi_register.c',
deps='avahi-common avahi-client',
enabled=bld.env.with_avahi)
--
1.7.9.5
From 251fdaf46852320321ff22f3d30869bac848e7bd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:39:57 +0200
Subject: [PATCH 018/101] build: list source of subsystem SERVER_MUTEX
directly in its definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 9276eb3..31ad867 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SERVER_MUTEX_SRC = 'lib/server_mutex.c'
-
PASSCHANGE_SRC = '''libsmb/passchange.c'''
LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
@@ -584,8 +582,8 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
private_library=True)
bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
- source=SERVER_MUTEX_SRC,
- deps='talloc')
+ source='lib/server_mutex.c',
+ deps='talloc')
bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
source=PARAM_UTIL_SRC,
--
1.7.9.5
From fe67d75dc72a933227a50ca34fe29e35f7e420cd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:40:42 +0200
Subject: [PATCH 019/101] build: list source of subsystem PASSCHANGE directly
in definition and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 31ad867..bf453bf 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PASSCHANGE_SRC = '''libsmb/passchange.c'''
-
LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
rpc_client/init_spoolss.c'''
@@ -947,12 +945,11 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
- source=PASSCHANGE_SRC,
+ source='libsmb/passchange.c',
deps='''LIBCLI_SAMR
INIT_LSA
msrpc3
- krb5samba''',
- vars=locals())
+ krb5samba''')
bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
source='lib/version.c',
--
1.7.9.5
From 6344dc4c2d5d9d63c24da2c2ae3af4d0d97d2649 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:42:14 +0200
Subject: [PATCH 020/101] build: list sources of cli_spoolss directly in the
definition.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index bf453bf..098b23e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
- rpc_client/init_spoolss.c'''
-
LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
@@ -1011,7 +1008,8 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
private_library=True)
bld.SAMBA3_LIBRARY('cli_spoolss',
- source=LIBCLI_SPOOLSS_SRC,
+ source='''rpc_client/cli_spoolss.c
+ rpc_client/init_spoolss.c''',
deps='RPC_NDR_SPOOLSS param secrets3',
private_library=True)
--
1.7.9.5
From 366be9b115f493e1186301b2e38dfd7681efedaf Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:43:06 +0200
Subject: [PATCH 021/101] build: list sources of library libcli_lsa3 directly
in the definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 098b23e..a7d8f48 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
-
LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
@@ -998,7 +996,7 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
deps='RPC_NDR_SAMR')
bld.SAMBA3_LIBRARY('libcli_lsa3',
- source=LIBCLI_LSA_SRC,
+ source='rpc_client/cli_lsarpc.c',
deps='RPC_NDR_LSA INIT_LSA',
private_library=True)
--
1.7.9.5
From ea603caa67c113a29929a969b91ebfac55f9c57c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:43:49 +0200
Subject: [PATCH 022/101] build: list sources of subsystem LIBCLI_SAMR
directly in the definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index a7d8f48..39d5764 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-
LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
# this includes only the low level parse code, not stuff
@@ -992,7 +990,7 @@ bld.SAMBA3_SUBSYSTEM('errors3',
deps='errors')
bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
- source=LIBCLI_SAMR_SRC,
+ source='rpc_client/cli_samr.c',
deps='RPC_NDR_SAMR')
bld.SAMBA3_LIBRARY('libcli_lsa3',
--
1.7.9.5
From b45b9cdef2faed0cf232728d2724fa030ed3384e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:44:58 +0200
Subject: [PATCH 023/101] build: list sources of libcli_netlogon3 library
directly in the definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 39d5764..f32a923 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
-
# this includes only the low level parse code, not stuff
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
@@ -999,7 +997,7 @@ bld.SAMBA3_LIBRARY('libcli_lsa3',
private_library=True)
bld.SAMBA3_LIBRARY('libcli_netlogon3',
- source=LIBCLI_NETLOGON_SRC,
+ source='rpc_client/cli_netlogon.c rpc_client/util_netlogon.c',
deps='RPC_NDR_NETLOGON INIT_NETLOGON cliauth param',
private_library=True)
--
1.7.9.5
From 935b91c5309dd233f70b41a46f3108ba806d4b55 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:49:33 +0200
Subject: [PATCH 024/101] build: split REG_PARSE_PRS as subsystem and list
sources of REGFIO directly.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f32a923..b177ef0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-# this includes only the low level parse code, not stuff
-# that requires knowledge of security contexts
-REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-
LIB_UTIL_SRC = '''
lib/system.c
lib/sendfile.c
@@ -90,8 +86,6 @@ LIBMSRPC_SRC = '''
REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-REGFIO_SRC = '''registry/regfio.c ${REG_PARSE_PRS_SRC}'''
-
REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
@@ -602,10 +596,14 @@ bld.SAMBA3_SUBSYSTEM('param_service',
source='param/service.c',
deps = 'USER_UTIL param PRINTING')
+# this includes only the low level parse code, not stuff
+# that requires knowledge of security contexts
+bld.SAMBA3_SUBSYSTEM('REG_PARSE_PRS',
+ source='registry/reg_parse_prs.c')
+
bld.SAMBA3_SUBSYSTEM('REGFIO',
- source=REGFIO_SRC,
- deps='samba-util',
- vars=locals())
+ source='registry/regfio.c',
+ deps='samba-util REG_PARSE_PRS')
bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
source=REG_API_REGF_SRC,
--
1.7.9.5
From 06baf745d3139f501c02ae7a475c29dc63d8f4e2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:51:12 +0200
Subject: [PATCH 025/101] build: list sources of subsystem samba3util directly
in definition and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b177ef0..ef9081c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,18 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIB_UTIL_SRC = '''
- lib/system.c
- lib/sendfile.c
- lib/recvfile.c
- lib/time.c
- lib/util_sid.c
- lib/util_file.c
- lib/util.c
- lib/util_sock.c
- lib/util_transfer_file.c
- lib/sock_exec.c'''
-
POPT_LIB_SRC = '''lib/popt_common.c'''
PARAM_UTIL_SRC = '''param/util.c'''
@@ -645,9 +633,17 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
vars=locals())
bld.SAMBA3_SUBSYSTEM('samba3util',
- source=LIB_UTIL_SRC,
- deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
- vars=locals())
+ source='''lib/system.c
+ lib/sendfile.c
+ lib/recvfile.c
+ lib/time.c
+ lib/util_sid.c
+ lib/util_file.c
+ lib/util.c
+ lib/util_sock.c
+ lib/util_transfer_file.c
+ lib/sock_exec.c''',
+ deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash')
bld.SAMBA3_SUBSYSTEM('TDB_LIB',
--
1.7.9.5
From 000fd89ea26ef0de0ebabbd0b6f3339ec362af50 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:54:19 +0200
Subject: [PATCH 026/101] build: list source of library popt_samba3 directly
in definition and rm vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ef9081c..77a42aa 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-POPT_LIB_SRC = '''lib/popt_common.c'''
-
PARAM_UTIL_SRC = '''param/util.c'''
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
@@ -617,9 +615,8 @@ bld.SAMBA3_SUBSYSTEM('REG_FULL',
vars=locals())
bld.SAMBA3_LIBRARY('popt_samba3',
- source=POPT_LIB_SRC,
+ source='lib/popt_common.c',
deps='popt samba-util util_cmdline',
- vars=locals(),
private_library=True)
bld.SAMBA3_LIBRARY('util_cmdline',
--
1.7.9.5
From b5101504a2499837cd75512025b3b4729de5edf1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:55:52 +0200
Subject: [PATCH 027/101] build: list source of subsystem PARAM_UTIL directly
in definition and remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 77a42aa..f2f4b83 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PARAM_UTIL_SRC = '''param/util.c'''
-
PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c'''
@@ -555,8 +553,8 @@ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
deps='talloc')
bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
- source=PARAM_UTIL_SRC,
- deps='talloc')
+ source='param/util.c',
+ deps='talloc')
bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
source='param/loadparm_ctx.c',
--
1.7.9.5
From aff825080e7aea91b85fddba756553157da00b6b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:57:22 +0200
Subject: [PATCH 028/101] build: list source of subsystem param directly in
definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f2f4b83..a0facaf 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PARAM_WITHOUT_REG_SRC = '''param/loadparm.c
- lib/sharesec.c lib/ldap_debug_handler.c lib/util_names.c'''
-
KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
LIBGPO_SRC0 = '''../libgpo/gpo_ldap.c ../libgpo/gpo_ini.c ../libgpo/gpo_util.c
@@ -567,7 +564,10 @@ bld.SAMBA_GENERATOR('param/param_global_h',
rule='${PERL} ${SRC[0].abspath(env)} ${SRC[1].abspath(env)} ${SRC[2].abspath(env)} --file ${TGT} --generate-scope=GLOBAL')
bld.SAMBA3_SUBSYSTEM('param',
- source=PARAM_WITHOUT_REG_SRC,
+ 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/param_global_h cups''')
bld.SAMBA3_PYTHON('pys3param',
--
1.7.9.5
From 9d3ee15948e92981725d561ff33380b06db9743b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 07:58:32 +0200
Subject: [PATCH 029/101] build: list source of subsystem KRBCLIENT directly
in defintion, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index a0facaf..3a1abb9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-KRBCLIENT_SRC = '''libads/kerberos.c libads/ads_status.c'''
-
LIBGPO_SRC0 = '''../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'''
@@ -623,9 +621,8 @@ bld.SAMBA3_LIBRARY('util_cmdline',
private_library=True)
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
- source=KRBCLIENT_SRC,
- public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB',
- vars=locals())
+ source='libads/kerberos.c libads/ads_status.c',
+ public_deps='krb5samba k5crypto gssapi LIBTSOCKET CLDAP LIBNMB')
bld.SAMBA3_SUBSYSTEM('samba3util',
source='''lib/system.c
--
1.7.9.5
From b272186e5164e51f02c5811a03ea426d2817609a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:00:16 +0200
Subject: [PATCH 030/101] build: list sources of library gpo directly in
definition, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 3a1abb9..85bfd5e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,11 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBGPO_SRC0 = '''../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'''
-LIBGPO_SRC = '''${LIBGPO_SRC0}'''
-
LIBADS_SRC = '''libads/ldap.c
libads/sasl.c libads/sasl_wrapping.c
libads/krb5_setpw.c
@@ -473,9 +468,14 @@ bld.SAMBA3_LIBRARY('msrpc3',
private_library=True)
bld.SAMBA3_LIBRARY('gpo',
- source='${LIBGPO_SRC}',
+ 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',
- vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('AVAHI',
--
1.7.9.5
From 2165b8b1a8b9f37ecce91a9c05879080cfcb9762 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:01:39 +0200
Subject: [PATCH 031/101] build: list sources of library ads directly in
sources, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 85bfd5e..6fec6ad 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,15 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBADS_SRC = '''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'''
-
LIBADS_SERVER_SRC = '''libads/authdata.c'''
LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
@@ -754,10 +745,21 @@ bld.SAMBA3_LIBRARY('smbldap',
public_headers='include/smbldap.h include/smb_ldap.h')
bld.SAMBA3_LIBRARY('ads',
- source=LIBADS_SRC,
+ 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,
- vars=locals())
+ private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
source=LIBADS_SERVER_SRC,
--
1.7.9.5
From de1e7130dbc2a26c4ad379106aaee0cdc5a4397b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:02:52 +0200
Subject: [PATCH 032/101] build: list sources of subsystem LIBADS_SERVER
directly in def, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 6fec6ad..180fa9a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBADS_SERVER_SRC = '''libads/authdata.c'''
-
LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
@@ -762,9 +760,8 @@ bld.SAMBA3_LIBRARY('ads',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
- source=LIBADS_SERVER_SRC,
- deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi',
- vars=locals())
+ source='libads/authdata.c',
+ deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi')
bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
source=LIBADS_PRINTER_SRC,
--
1.7.9.5
From 4f35a552f3ff5c2f8896e864a0e8ba607e579998 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:03:56 +0200
Subject: [PATCH 033/101] build: list source of subsys LIBADS_PRINTER directly
in def, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 180fa9a..26538cb 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
-
SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
passdb/machine_sid.c passdb/secrets_lsa.c'''
@@ -764,9 +762,8 @@ bld.SAMBA3_SUBSYSTEM('LIBADS_SERVER',
deps='SERVER_MUTEX ndr-krb5pac krb5samba gssapi')
bld.SAMBA3_SUBSYSTEM('LIBADS_PRINTER',
- source=LIBADS_PRINTER_SRC,
- deps='samba-util krb5samba',
- vars=locals())
+ source='libads/ldap_printer.c',
+ deps='samba-util krb5samba')
bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN',
source='lib/afs_settoken.c',
--
1.7.9.5
From 03544724cfc32d8687d33d8f2ba1c1532c4db076 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:05:50 +0200
Subject: [PATCH 034/101] build: list sources of lib secrets3 directly in def,
removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 26538cb..ba0917c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
- passdb/machine_sid.c passdb/secrets_lsa.c'''
-
LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
libsmb/namequery.c libsmb/conncache.c
@@ -724,10 +721,12 @@ 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=SECRETS_SRC,
+ 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,
- vars=locals())
+ private_library=True)
bld.SAMBA3_LIBRARY('smbldap',
source='lib/smbldap.c',
--
1.7.9.5
From 281a2d738c1b9fa93199425e7858e49de33a50de Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:24:04 +0200
Subject: [PATCH 035/101] build: list sources of subsys LIBNMB directly in
def, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ba0917c..4fa1afb 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,11 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBNMB_SRC = '''libsmb/unexpected.c libsmb/namecache.c libsmb/nmblib.c
- libsmb/namequery.c libsmb/conncache.c
-
- libads/sitename_cache.c'''
-
LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
libsmb/ntlmssp_wrap.c'''
@@ -902,9 +897,13 @@ bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNMB',
- source=LIBNMB_SRC,
- deps='addns lmhosts resolv',
- vars=locals())
+ source='''libsmb/unexpected.c
+ libsmb/namecache.c
+ libsmb/nmblib.c
+ libsmb/namequery.c
+ libsmb/conncache.c
+ libads/sitename_cache.c''',
+ deps='addns lmhosts resolv')
bld.SAMBA3_SUBSYSTEM('SERVICES',
source=SERVICES_SRC,
--
1.7.9.5
From 6bedc0534c25ce9a9e7b01429c13d791c857c735 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:28:14 +0200
Subject: [PATCH 036/101] build: list sources of subsys LIBNTLMSSP in
definition, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 4fa1afb..57660ae 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBNTLMSSP_SRC = '''
- libsmb/ntlmssp.c
- libsmb/ntlmssp_wrap.c'''
-
TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
@@ -682,9 +678,9 @@ bld.SAMBA3_LIBRARY('smbd_shim',
private_library=True)
bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
- source=LIBNTLMSSP_SRC,
- deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient',
- vars=locals())
+ source='''libsmb/ntlmssp.c
+ libsmb/ntlmssp_wrap.c''',
+ deps='NDR_NTLMSSP NTLMSSP_COMMON wbclient')
bld.SAMBA3_SUBSYSTEM('auth_generic',
source='libsmb/auth_generic.c',
--
1.7.9.5
From 941a53c9fa98064f30c8d67941a5b290ac711002 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:30:14 +0200
Subject: [PATCH 037/101] build: list sources of subsys TLDAP directly in
definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 57660ae..282e7fb 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
-
LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c
libsmb/clispnego.c
libsmb/clirap.c libsmb/clierror.c libsmb/climessage.c
@@ -463,7 +461,9 @@ bld.SAMBA3_SUBSYSTEM('GROUPDB',
deps='tdb_compat')
bld.SAMBA3_SUBSYSTEM('TLDAP',
- source=TLDAP_SRC,
+ source='''lib/tldap.c
+ lib/tldap_util.c
+ lib/util_tsock.c''',
deps='asn1util LIBTSOCKET')
# libpdb.so should not expose internal symbols that are only usable
--
1.7.9.5
From 8fd428098841b80c1d2f93be8f130955c9582f14 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:32:01 +0200
Subject: [PATCH 038/101] build: list sources of library libsmb directly in
def, also removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 282e7fb..68fcd15 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,21 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBSMB_SRC = '''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/smb2cli_tcon.c
- libsmb/cli_np_tstream.c
- libsmb/reparse_symlink.c
- libsmb/clisymlink.c
- libsmb/smbsock_connect.c
- libsmb/cli_smb2_fnum.c'''
-
LIBMSRPC_SRC = '''
rpc_client/cli_pipe.c
rpc_client/rpc_transport_np.c
@@ -688,7 +673,32 @@ bld.SAMBA3_SUBSYSTEM('auth_generic',
vars=locals())
bld.SAMBA3_LIBRARY('libsmb',
- source=LIBSMB_SRC,
+ 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/smb2cli_tcon.c
+ libsmb/cli_np_tstream.c
+ libsmb/reparse_symlink.c
+ libsmb/clisymlink.c
+ libsmb/smbsock_connect.c
+ libsmb/cli_smb2_fnum.c''',
deps='''
LIBNTLMSSP
auth_generic
@@ -700,7 +710,6 @@ bld.SAMBA3_LIBRARY('libsmb',
cli_smb_common
util_cmdline
tevent''',
- vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('CLDAP',
--
1.7.9.5
From 5701ac1d05d58ae118d2a8a66a3be1b24c854dc5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:33:08 +0200
Subject: [PATCH 039/101] build: list sources of lib msrpc3 directly in def,
removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 68fcd15..5ff86c0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,14 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBMSRPC_SRC = '''
- 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
- '''
-
#
# registry-related objects
#
@@ -416,13 +408,16 @@ bld.SAMBA3_LIBRARY('gse',
private_library=True)
bld.SAMBA3_LIBRARY('msrpc3',
- source='${LIBMSRPC_SRC}',
+ 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''',
- vars=locals(),
private_library=True)
bld.SAMBA3_LIBRARY('gpo',
--
1.7.9.5
From 9ffacf78729965d08864eb9ce6a352a4fd578697 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:38:04 +0200
Subject: [PATCH 040/101] build: list sources of lib smbregistry directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 5ff86c0..6bb8661 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -23,18 +23,6 @@ REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
registry/reg_backend_current_version.c
registry/reg_backend_perflib.c'''
-REG_BASE_SRC = '''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'''
-
REG_SMBCONF_SRC = '''
${REG_BACKENDS_SMBCONF_SRC}
${REG_INIT_SMBCONF_SRC}
@@ -548,7 +536,17 @@ bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
vars=locals())
bld.SAMBA3_LIBRARY('smbregistry',
- source=REG_BASE_SRC,
+ 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 NDR_SECURITY util_tdb talloc
replace util_reg samba-util samba-security
errors3 dbwrap samba3-util''',
--
1.7.9.5
From c6e59de78c587c5a13d5e3ed700a2a9b6cc9607a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:38:45 +0200
Subject: [PATCH 041/101] build: list sources of subsys REG_SMBCONF directly
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 17 +++++------------
1 file changed, 5 insertions(+), 12 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 6bb8661..f4f57ab 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -7,13 +7,10 @@ import samba_version, samba3
# registry-related objects
#
-REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c'''
REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
-REG_BACKENDS_SMBCONF_SRC = '''registry/reg_backend_smbconf.c'''
-
REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
registry/reg_backend_shares.c
registry/reg_backend_netlogon_params.c
@@ -23,12 +20,6 @@ REG_BACKENDS_EXTRA_SRC = '''registry/reg_backend_printing.c
registry/reg_backend_current_version.c
registry/reg_backend_perflib.c'''
-REG_SMBCONF_SRC = '''
- ${REG_BACKENDS_SMBCONF_SRC}
- ${REG_INIT_SMBCONF_SRC}
- registry/reg_util_token.c
- registry/reg_api_util.c'''
-
REG_FULL_SRC = '''
${REG_BACKENDS_EXTRA_SRC}
${REG_INIT_FULL_SRC}
@@ -554,9 +545,11 @@ bld.SAMBA3_LIBRARY('smbregistry',
private_library=True)
bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
- source=REG_SMBCONF_SRC,
- deps='smbregistry',
- vars=locals())
+ 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',
source=REG_FULL_SRC,
--
1.7.9.5
From 31c00bf0436db845bbb3b9d5066d7b7fd0d7b8f5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:40:46 +0200
Subject: [PATCH 042/101] build: list sources of subsys REG_FULL directly in
def, remov vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 30 +++++++++++-------------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f4f57ab..26ad3ee 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -7,24 +7,8 @@ import samba_version, samba3
# registry-related objects
#
-REG_INIT_FULL_SRC = '''registry/reg_init_full.c'''
-
REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
-REG_BACKENDS_EXTRA_SRC = '''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'''
-
-REG_FULL_SRC = '''
- ${REG_BACKENDS_EXTRA_SRC}
- ${REG_INIT_FULL_SRC}
- registry/reg_perfcount.c'''
-
SERVICES_SRC = '''services/svc_spoolss.c
services/svc_rcinit.c
services/svc_winreg_glue.c
@@ -552,9 +536,17 @@ bld.SAMBA3_SUBSYSTEM('REG_SMBCONF',
deps='smbregistry')
bld.SAMBA3_SUBSYSTEM('REG_FULL',
- source=REG_FULL_SRC,
- deps='REG_SMBCONF tdb-wrap3',
- vars=locals())
+ 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',
--
1.7.9.5
From 4070da90419231265bd092ae92fcf98e91dab479 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:41:53 +0200
Subject: [PATCH 043/101] build: list sources of REG_API_REGF directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 26ad3ee..2e89cdc 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,12 +3,6 @@
from samba_utils import *
import samba_version, samba3
-#
-# registry-related objects
-#
-
-REG_API_REGF_SRC = '''registry/reg_api_regf.c'''
-
SERVICES_SRC = '''services/svc_spoolss.c
services/svc_rcinit.c
services/svc_winreg_glue.c
@@ -506,9 +500,8 @@ bld.SAMBA3_SUBSYSTEM('REGFIO',
deps='samba-util REG_PARSE_PRS')
bld.SAMBA3_SUBSYSTEM('REG_API_REGF',
- source=REG_API_REGF_SRC,
- deps='samba-util',
- vars=locals())
+ source='registry/reg_api_regf.c',
+ deps='samba-util')
bld.SAMBA3_LIBRARY('smbregistry',
source='''registry/reg_api.c
--
1.7.9.5
From e7610c7858f8571c6a306c39d7c2e95a7df360aa Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:43:28 +0200
Subject: [PATCH 044/101] build: list sources of SERVICES directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 2e89cdc..89d4bb9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,13 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SERVICES_SRC = '''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'''
-
LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
@@ -882,9 +875,13 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
deps='addns lmhosts resolv')
bld.SAMBA3_SUBSYSTEM('SERVICES',
- source=SERVICES_SRC,
- deps='samba-util',
- vars=locals())
+ 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',
source=PLAINTEXT_AUTH_SRC,
--
1.7.9.5
From a0ddf06ca8c6eb9bdbc63798c257bca41f05456b Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:44:17 +0200
Subject: [PATCH 045/101] build: list source of subsys LIBEVENTLOG directly in
definition, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 89d4bb9..d3b69a9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIB_EVENTLOG_SRC = '''lib/eventlog/eventlog.c'''
-
RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c locking/share_mode_lock.c'''
@@ -861,9 +859,8 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
- source=LIB_EVENTLOG_SRC,
- deps='NDR_EVENTLOG tdb_compat',
- vars=locals())
+ source='lib/eventlog/eventlog.c',
+ deps='NDR_EVENTLOG tdb_compat')
bld.SAMBA3_SUBSYSTEM('LIBNMB',
source='''libsmb/unexpected.c
--
1.7.9.5
From af505d25a595dfb93cd7c87bc0b6c9fc565312c3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:45:21 +0200
Subject: [PATCH 046/101] build: list source of subsys RPC_CLIENT_SCHANNEL
direclty in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index d3b69a9..c6d453c 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-RPC_CLIENT_SCHANNEL_SRC = '''rpc_client/cli_pipe_schannel.c'''
-
LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c locking/share_mode_lock.c'''
PRIVILEGES_SRC = '''lib/privileges.c'''
@@ -966,9 +964,8 @@ bld.SAMBA3_SUBSYSTEM('LIBCLI_WINREG_INTERNAL',
deps='LIBCLI_WINREG RPC_NCACN_NP')
bld.SAMBA3_SUBSYSTEM('RPC_CLIENT_SCHANNEL',
- source=RPC_CLIENT_SCHANNEL_SRC,
- deps='samba-util krb5samba',
- vars=locals())
+ source='rpc_client/cli_pipe_schannel.c',
+ deps='samba-util krb5samba')
bld.SAMBA3_SUBSYSTEM('INIT_LSA',
source='rpc_client/init_lsa.c',
--
1.7.9.5
From dc44a729f85b6a66e49d97fb158ce0a2b82ea295 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:47:20 +0200
Subject: [PATCH 047/101] build: list sources of subsys LOCKING directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index c6d453c..8f54fd7 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LOCKING_SRC = '''locking/locking.c locking/brlock.c locking/posix.c locking/share_mode_lock.c'''
-
PRIVILEGES_SRC = '''lib/privileges.c'''
PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
@@ -790,13 +788,15 @@ bld.SAMBA3_LIBRARY('smbd_base',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LOCKING',
- source='${LOCKING_SRC}',
+ source='''locking/locking.c
+ locking/brlock.c
+ locking/posix.c
+ locking/share_mode_lock.c''',
deps='''
tdb_compat
talloc
NDR_OPEN_FILES
- FNAME_UTIL''',
- vars=locals())
+ FNAME_UTIL''')
bld.SAMBA3_SUBSYSTEM('PROFILE',
source='${PROFILE_SRC}',
--
1.7.9.5
From 2531257570a33f2231c98a557ec8989eead9ddc4 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:54:58 +0200
Subject: [PATCH 048/101] build: list sources of lib pdb directly in def,
removing vars=locals()
Also, remove a comment
"#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC"
while moving he list:
lib/winbind_util.c is in fact a winbind wrapper for passdb.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 43 ++++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 21 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 8f54fd7..dd889da 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,21 +3,7 @@
from samba_utils import *
import samba_version, samba3
-PRIVILEGES_SRC = '''lib/privileges.c'''
-
-PASSDB_GET_SET_SRC = '''passdb/pdb_get_set.c'''
-
-PASSDB_SRC = '''${PASSDB_GET_SET_SRC} 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 ${PRIVILEGES_SRC}
- lib/util_nscd.c lib/winbind_util.c
- passdb/pdb_util.c passdb/pdb_interface.c
- passdb/pdb_secrets.c
- passdb/pdb_unixid.c'''
-#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
+
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
@@ -421,19 +407,34 @@ private_pdb_match = private_pdb_match + ldapsam_pdb_match
private_pdb_match = private_pdb_match + map(lambda x: '!pdb_%s_init' % x, static_pdb_match)
bld.SAMBA3_LIBRARY('pdb',
- source=PASSDB_SRC,
+ 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',
private_library=False,
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',
- vars=locals())
+ vnum='0')
bld.SAMBA3_LIBRARY('smbldaphelper',
source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
--
1.7.9.5
From 29a9ef926a56310079d7f5334db704cfdd826f29 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:57:08 +0200
Subject: [PATCH 049/101] build: list source of subsys GROUPDB direclty in def
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index dd889da..d12f37f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-
-
-GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
-
PROFILE_SRC = '''profile/profile.c'''
PROFILES_SRC = '''utils/profiles.c'''
@@ -367,7 +363,7 @@ bld.SAMBA3_SUBSYSTEM('AVAHI',
enabled=bld.env.with_avahi)
bld.SAMBA3_SUBSYSTEM('GROUPDB',
- source=GROUPDB_SRC,
+ source='groupdb/mapping.c groupdb/mapping_tdb.c',
deps='tdb_compat')
bld.SAMBA3_SUBSYSTEM('TLDAP',
--
1.7.9.5
From 8e7e258d1a479365b782860c173322fd6c891726 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:58:00 +0200
Subject: [PATCH 050/101] build: list source of subsys PROFILE directly in
definition
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index d12f37f..8add31a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PROFILE_SRC = '''profile/profile.c'''
PROFILES_SRC = '''utils/profiles.c'''
OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c'''
@@ -796,9 +795,8 @@ bld.SAMBA3_SUBSYSTEM('LOCKING',
FNAME_UTIL''')
bld.SAMBA3_SUBSYSTEM('PROFILE',
- source='${PROFILE_SRC}',
- deps='samba-util',
- vars=locals())
+ source='profile/profile.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
--
1.7.9.5
From 2508d1d49859bb8a30491a6675679d9965cc2d0a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 08:58:56 +0200
Subject: [PATCH 051/101] build: list sources of binary profiles directly in
def, remov vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 8add31a..ed5e837 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PROFILES_SRC = '''utils/profiles.c'''
-
OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c'''
NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
@@ -1211,13 +1209,12 @@ bld.SAMBA3_BINARY('net',
vars=locals())
bld.SAMBA3_BINARY('profiles',
- source=PROFILES_SRC,
+ source='utils/profiles.c',
deps='''
talloc
popt_samba3
param
- REGFIO''',
- vars=locals())
+ REGFIO''')
bld.SAMBA3_BINARY('smbspool',
source=CUPS_SRC,
--
1.7.9.5
From f73430faabf63293895a8ea441df50d9891a7e74 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:06:25 +0200
Subject: [PATCH 052/101] build: list sources of library smbd_base directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 225 ++++++++++++++++++++++++++++---------------------
1 file changed, 127 insertions(+), 98 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ed5e837..ea4a25e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-OPLOCK_SRC = '''smbd/oplock.c smbd/oplock_irix.c smbd/oplock_linux.c'''
-
-NOTIFY_SRC = '''smbd/notify.c smbd/notify_inotify.c smbd/notify_internal.c'''
-
FNAME_UTIL_SRC = '''lib/filename_util.c'''
@@ -16,72 +12,9 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
-MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
-
SMBD_SRC_MAIN = '''smbd/server.c'''
-BUILDOPT_SRC = '''smbd/build_options.c'''
-
-SMBD_SRC_SRV = '''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 printing/spoolssd.c
- lib/sysquotas.c lib/sysquotas_linux.c
- lib/sysquotas_xfs.c lib/sysquotas_4A.c lib/sysquotas_4B.c
- lib/sysquotas_nfs.c
- lib/background.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_find.c
- smbd/smb2_notify.c
- smbd/smb2_getinfo.c
- smbd/smb2_setinfo.c
- smbd/smb2_break.c
- smbd/smbXsrv_version.c
- smbd/smbXsrv_session.c
- smbd/smbXsrv_tcon.c
- smbd/smbXsrv_open.c
- smbd/server_exit.c
- smbd/durable.c
- smbd/scavenger.c
- ${MANGLE_SRC}'''
-
-SMBD_SRC_BASE = '''${SMBD_SRC_SRV}
- ${OPLOCK_SRC} ${NOTIFY_SRC}
- ${BUILDOPT_SRC}'''
+
PRINTING_SRC = '''printing/pcap.c printing/print_svid.c printing/print_aix.c
printing/print_cups.c printing/print_generic.c
@@ -750,36 +683,132 @@ bld.SAMBA3_LIBRARY('smbd_conn',
private_library=True)
bld.SAMBA3_LIBRARY('smbd_base',
- source=SMBD_SRC_BASE,
- deps='''
- talloc
- tevent
- pdb
- libsmb
- msrpc3
- vfs
- vfs_default
- vfs_posixacl
- popt_samba3
- samba3core
- smbd_conn
- param_service
- AVAHI
- PRINTBASE
- PROFILE
- LOCKING
- LIBADS_SERVER
- LIBAFS
- RPC_SERVER
- NDR_SMBXSRV
- LIBASYS
- ccan-hash
- NDR_SMB_ACL
- netapi
- NDR_IOCTL
- ''' + bld.env['dmapi_lib'],
- private_library=True,
- vars=locals())
+ 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
+ printing/spoolssd.c
+ lib/sysquotas.c
+ lib/sysquotas_linux.c
+ lib/sysquotas_xfs.c
+ lib/sysquotas_4A.c
+ lib/sysquotas_4B.c
+ lib/sysquotas_nfs.c
+ lib/background.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_find.c
+ smbd/smb2_notify.c
+ smbd/smb2_getinfo.c
+ smbd/smb2_setinfo.c
+ smbd/smb2_break.c
+ smbd/smbXsrv_version.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_inotify.c
+ smbd/notify_internal.c
+ smbd/build_options.c''',
+ deps='''
+ talloc
+ tevent
+ pdb
+ libsmb
+ msrpc3
+ vfs
+ vfs_default
+ vfs_posixacl
+ popt_samba3
+ samba3core
+ smbd_conn
+ param_service
+ AVAHI
+ PRINTBASE
+ PROFILE
+ LOCKING
+ LIBADS_SERVER
+ LIBAFS
+ RPC_SERVER
+ NDR_SMBXSRV
+ LIBASYS
+ ccan-hash
+ NDR_SMB_ACL
+ netapi
+ NDR_IOCTL
+ ''' + bld.env['dmapi_lib'],
+ private_library=True)
bld.SAMBA3_SUBSYSTEM('LOCKING',
source='''locking/locking.c
--
1.7.9.5
From 986b8597b9ae504a049a8c23b9e39ba6fce2389a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:07:16 +0200
Subject: [PATCH 053/101] build: list source of FNAME_UTIL directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ea4a25e..7148620 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-FNAME_UTIL_SRC = '''lib/filename_util.c'''
-
-
PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
@@ -852,9 +849,8 @@ bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
vars=locals())
bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
- source=FNAME_UTIL_SRC,
- deps='samba-util',
- vars=locals())
+ source='lib/filename_util.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
--
1.7.9.5
From 653c199a4254e4cf7018b7fce5b747e6f61a6c94 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:08:29 +0200
Subject: [PATCH 054/101] build: list sources of subsys PLAINTEXT_AUTH
directly in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 7148620..3fb2d15 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PLAINTEXT_AUTH_SRC = '''auth/pampass.c auth/pass_check.c'''
-
SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
@@ -897,9 +895,8 @@ bld.SAMBA3_SUBSYSTEM('SERVICES',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
- source=PLAINTEXT_AUTH_SRC,
- deps='pam PAM_ERRORS',
- vars=locals())
+ source='''auth/pampass.c auth/pass_check.c''',
+ deps='pam PAM_ERRORS')
bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
source='libsmb/passchange.c',
--
1.7.9.5
From 1f55ec179b6608b9580c4931abcc095e1dbac899 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:09:47 +0200
Subject: [PATCH 055/101] build: list sources of subsys SLCACHE directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 3fb2d15..b0576d5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
-
DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
SMBD_SRC_MAIN = '''smbd/server.c'''
@@ -910,9 +908,8 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('SLCACHE',
- source=SLCACHE_SRC,
- deps='samba-util tdb_compat',
- vars=locals())
+ source='libsmb/samlogon_cache.c',
+ deps='samba-util tdb_compat')
bld.SAMBA3_SUBSYSTEM('DCUTIL',
source=DCUTIL_SRC,
--
1.7.9.5
From 12cfd65764b2b7d541a450b2ea8cc489eb2a2029 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:11:10 +0200
Subject: [PATCH 056/101] build: list sources of subsys DCUTIL directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b0576d5..a39a11d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-DCUTIL_SRC = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
-
SMBD_SRC_MAIN = '''smbd/server.c'''
@@ -912,9 +910,10 @@ bld.SAMBA3_SUBSYSTEM('SLCACHE',
deps='samba-util tdb_compat')
bld.SAMBA3_SUBSYSTEM('DCUTIL',
- source=DCUTIL_SRC,
- deps='ads msrpc3 libcli_lsa3',
- vars=locals())
+ 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',
--
1.7.9.5
From da36fee019aeb9c8a682f47034b5e56db3ac52a2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:12:21 +0200
Subject: [PATCH 057/101] build: list source of binary smbd/smbd diectly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index a39a11d..ca2ca03 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBD_SRC_MAIN = '''smbd/server.c'''
-
-
-
PRINTING_SRC = '''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
@@ -993,10 +989,9 @@ bld.SAMBA3_SUBSYSTEM('INIT_SAMR',
########################## BINARIES #################################
bld.SAMBA3_BINARY('smbd/smbd',
- source='${SMBD_SRC_MAIN}',
+ source='smbd/server.c',
deps='smbd_base EPMD LSASD',
- install_path='${SBINDIR}',
- vars=locals())
+ install_path='${SBINDIR}')
bld.SAMBA3_BINARY('nmbd/nmbd',
source='''nmbd/asyncdns.c nmbd/nmbd.c nmbd/nmbd_become_dmb.c
--
1.7.9.5
From 9578cbcbe335073d0c664961460c36d806a645ec Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:14:07 +0200
Subject: [PATCH 058/101] build: list sources of subsys PRINTING directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ca2ca03..ad78979 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,11 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PRINTING_SRC = '''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'''
-
PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
PRINTBACKEND_SRC = '''printing/printing.c
printing/nt_printing.c
@@ -829,9 +824,17 @@ bld.SAMBA3_LIBRARY('printing_migrate',
private_library=True)
bld.SAMBA3_SUBSYSTEM('PRINTING',
- source=PRINTING_SRC,
- deps='NDR_PRINTCAP tdb_compat cups',
- vars=locals())
+ 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_compat cups')
bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
source=PASSWD_UTIL_SRC,
--
1.7.9.5
From f272493a4682ca31ef3d13f1b2a231889abd41d2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:16:28 +0200
Subject: [PATCH 059/101] build: list sources of subsys PRINTBASE directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index ad78979..bd83777 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PRINTBASE_SRC = '''printing/notify.c printing/printing_db.c'''
PRINTBACKEND_SRC = '''printing/printing.c
printing/nt_printing.c
printing/nt_printing_tdb.c
@@ -808,9 +807,8 @@ bld.SAMBA3_SUBSYSTEM('PROFILE',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('PRINTBASE',
- source=PRINTBASE_SRC,
- deps='samba-util tdb_compat',
- vars=locals())
+ source='''printing/notify.c printing/printing_db.c''',
+ deps='samba-util tdb_compat')
bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
source=PRINTBACKEND_SRC,
--
1.7.9.5
From aceec47f775f037619889d39b52329451cfb7b27 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:17:18 +0200
Subject: [PATCH 060/101] build: list sources of subsys PRINTBACKEND direclty
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index bd83777..64129eb 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,13 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PRINTBACKEND_SRC = '''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'''
-
STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
@@ -811,9 +804,13 @@ bld.SAMBA3_SUBSYSTEM('PRINTBASE',
deps='samba-util tdb_compat')
bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
- source=PRINTBACKEND_SRC,
- deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate',
- vars=locals())
+ 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_compat printing_migrate')
bld.SAMBA3_LIBRARY('printing_migrate',
source='printing/nt_printing_migrate.c rpc_client/cli_winreg_spoolss.c printing/nt_printing_os2.c',
--
1.7.9.5
From 971cbe308aa2aaa013dd8bb622951b1d61f32226 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:18:48 +0200
Subject: [PATCH 061/101] build: list sources of binary smbstatus directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 64129eb..c7733d4 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-STATUS_SRC = '''utils/status.c utils/status_profile.c smbd/notify_internal.c'''
-
SMBCONTROL_SRC = '''utils/smbcontrol.c'''
SMBTREE_SRC = '''utils/smbtree.c'''
@@ -1254,15 +1252,16 @@ bld.SAMBA3_BINARY('smbta-util',
vars=locals())
bld.SAMBA3_BINARY('smbstatus',
- source=STATUS_SRC,
+ source='''utils/status.c
+ utils/status_profile.c
+ smbd/notify_internal.c''',
deps='''
talloc
param
popt_samba3
smbd_base
LOCKING
- PROFILE''',
- vars=locals())
+ PROFILE''')
bld.SAMBA3_BINARY('smbcontrol',
source=SMBCONTROL_SRC,
--
1.7.9.5
From 5207caf4b41d794770d054dbd0e05bd733cc901f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:19:31 +0200
Subject: [PATCH 062/101] build: list sources of binary smbcontrol directly in
sources, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index c7733d4..065b95b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBCONTROL_SRC = '''utils/smbcontrol.c'''
-
SMBTREE_SRC = '''utils/smbtree.c'''
TESTPARM_SRC = 'utils/testparm.c'
@@ -1264,13 +1262,12 @@ bld.SAMBA3_BINARY('smbstatus',
PROFILE''')
bld.SAMBA3_BINARY('smbcontrol',
- source=SMBCONTROL_SRC,
+ source='utils/smbcontrol.c',
deps='''
talloc
param
popt_samba3
- PRINTBASE''',
- vars=locals())
+ PRINTBASE''')
bld.SAMBA3_BINARY('smbtree',
source=SMBTREE_SRC,
--
1.7.9.5
From 061427df4bdd5dcbde9e5bb0876eae2899977d8c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:20:54 +0200
Subject: [PATCH 063/101] build: list sources of smbtree direclty in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 065b95b..3e25de8 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBTREE_SRC = '''utils/smbtree.c'''
-
TESTPARM_SRC = 'utils/testparm.c'
SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
@@ -1270,7 +1268,7 @@ bld.SAMBA3_BINARY('smbcontrol',
PRINTBASE''')
bld.SAMBA3_BINARY('smbtree',
- source=SMBTREE_SRC,
+ source='utils/smbtree.c',
deps='''
talloc
param
@@ -1278,8 +1276,7 @@ bld.SAMBA3_BINARY('smbtree',
msrpc3
popt_samba3
PROFILE
- RPC_NDR_SRVSVC''',
- vars=locals())
+ RPC_NDR_SRVSVC''')
bld.SAMBA3_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
--
1.7.9.5
From 8d14df56e740ba713d42192d2a4c97d725d27678 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:21:53 +0200
Subject: [PATCH 064/101] build: list source of binary testparm directly in
dev, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 3e25de8..c20b521 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-TESTPARM_SRC = 'utils/testparm.c'
-
SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
@@ -1232,12 +1230,11 @@ bld.SAMBA3_BINARY('smbspool',
vars=locals())
bld.SAMBA3_BINARY('testparm',
- source=TESTPARM_SRC,
+ source='utils/testparm.c',
deps='''
talloc
param
- popt_samba3''',
- vars=locals())
+ popt_samba3''')
bld.SAMBA3_BINARY('smbta-util',
source=SMBTA_UTIL_SRC,
--
1.7.9.5
From f1cb97597a86b09f40bd20318d6161cdf5bf8663 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:22:56 +0200
Subject: [PATCH 065/101] build: list sources of binary smbta-util directly in
def, removing vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index c20b521..929d7ba 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBTA_UTIL_SRC = '''utils/smbta-util.c'''
-
TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
@@ -1237,12 +1235,11 @@ bld.SAMBA3_BINARY('testparm',
popt_samba3''')
bld.SAMBA3_BINARY('smbta-util',
- source=SMBTA_UTIL_SRC,
+ source='utils/smbta-util.c',
deps='''
talloc
secrets3
- param''',
- vars=locals())
+ param''')
bld.SAMBA3_BINARY('smbstatus',
source='''utils/status.c
--
1.7.9.5
From aa674f8e76c4a0654cdc24417ae9b08444fe11e0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:23:47 +0200
Subject: [PATCH 066/101] build: list sources of binary test_lp_load directly
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 929d7ba..3329f6a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-TEST_LP_LOAD_SRC = '''param/test_lp_load.c'''
-
PASSWD_UTIL_SRC = 'utils/passwd_util.c'
SMBPASSWD_SRC = '''utils/smbpasswd.c'''
@@ -1467,13 +1465,12 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
vars=locals())
bld.SAMBA3_BINARY('test_lp_load',
- source=TEST_LP_LOAD_SRC,
+ source='param/test_lp_load.c',
deps='''
talloc
param
popt_samba3''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('dbwrap_tool',
source=DBWRAP_TOOL_SRC,
--
1.7.9.5
From 35252bfbbed5d0983aa761dbfe8d3c3a9c055428 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:24:28 +0200
Subject: [PATCH 067/101] build: list source of subsys PASSWD_UTIL directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 3329f6a..b981fef 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PASSWD_UTIL_SRC = 'utils/passwd_util.c'
-
SMBPASSWD_SRC = '''utils/smbpasswd.c'''
PDBEDIT_SRC = '''utils/pdbedit.c'''
@@ -820,9 +818,8 @@ bld.SAMBA3_SUBSYSTEM('PRINTING',
deps='NDR_PRINTCAP tdb_compat cups')
bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
- source=PASSWD_UTIL_SRC,
- deps='samba-util',
- vars=locals())
+ source='utils/passwd_util.c',
+ deps='samba-util')
bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
source='lib/filename_util.c',
--
1.7.9.5
From ae485a995a925b6c886db05a134ee2afdd28acea Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:32:05 +0200
Subject: [PATCH 068/101] build: list source of binary smbpasswd directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b981fef..44e4110 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBPASSWD_SRC = '''utils/smbpasswd.c'''
-
PDBEDIT_SRC = '''utils/pdbedit.c'''
SMBGET_SRC = '''utils/smbget.c'''
@@ -1268,14 +1266,13 @@ bld.SAMBA3_BINARY('smbtree',
RPC_NDR_SRVSVC''')
bld.SAMBA3_BINARY('smbpasswd',
- source=SMBPASSWD_SRC,
+ source='utils/smbpasswd.c',
deps='''
talloc
param
pdb
PASSWD_UTIL
- PASSCHANGE''',
- vars=locals())
+ PASSCHANGE''')
bld.SAMBA3_BINARY('pdbedit',
source=PDBEDIT_SRC,
--
1.7.9.5
From 615575976720f7aaf84a12541f7ae392ce25b2fc Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:32:58 +0200
Subject: [PATCH 069/101] build: list source of binary pdbedit directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 44e4110..87c92b1 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PDBEDIT_SRC = '''utils/pdbedit.c'''
-
SMBGET_SRC = '''utils/smbget.c'''
RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
@@ -1275,14 +1273,13 @@ bld.SAMBA3_BINARY('smbpasswd',
PASSCHANGE''')
bld.SAMBA3_BINARY('pdbedit',
- source=PDBEDIT_SRC,
+ source='utils/pdbedit.c',
deps='''
talloc
param
popt_samba3
pdb
- PASSWD_UTIL''',
- vars=locals())
+ PASSWD_UTIL''')
bld.SAMBA3_BINARY('smbget',
source=SMBGET_SRC,
--
1.7.9.5
From 527c46a2fd9680b6e8e68157e6c2e4942dac402d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:33:57 +0200
Subject: [PATCH 070/101] build: list source of binary smbget directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 87c92b1..3a06c6d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBGET_SRC = '''utils/smbget.c'''
-
RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c
rpcclient/cmd_netlogon.c rpcclient/cmd_srvsvc.c
@@ -1282,12 +1280,11 @@ bld.SAMBA3_BINARY('pdbedit',
PASSWD_UTIL''')
bld.SAMBA3_BINARY('smbget',
- source=SMBGET_SRC,
+ source='utils/smbget.c',
deps='''
talloc
popt_samba3
- smbclient''',
- vars=locals())
+ smbclient''')
bld.SAMBA3_BINARY('nmblookup',
source=NMBLOOKUP_SRC,
--
1.7.9.5
From a8b1388319fedbc7d449066fa0d0c4e4acd5a178 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:36:10 +0200
Subject: [PATCH 071/101] build: list sources of binary rpcclinet directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 3a06c6d..5d6c878 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,18 +3,6 @@
from samba_utils import *
import samba_version, samba3
-RPCCLIENT_SRC1 = '''rpcclient/rpcclient.c rpcclient/cmd_lsarpc.c
- rpcclient/cmd_samr.c rpcclient/cmd_spoolss.c
- rpcclient/cmd_netlogon.c rpcclient/cmd_srvsvc.c
- rpcclient/cmd_dfs.c rpcclient/cmd_epmapper.c
- rpcclient/cmd_dssetup.c rpcclient/cmd_echo.c
- rpcclient/cmd_shutdown.c rpcclient/cmd_test.c
- rpcclient/cmd_wkssvc.c rpcclient/cmd_ntsvcs.c
- rpcclient/cmd_drsuapi.c rpcclient/cmd_eventlog.c
- rpcclient/cmd_winreg.c rpcclient/cmd_fss.c'''
-
-RPCCLIENT_SRC = '''${RPCCLIENT_SRC1}'''
-
LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
libsmb/libsmb_thread_posix.c'''
@@ -1111,7 +1099,24 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
install_path='${SBINDIR}')
bld.SAMBA3_BINARY('rpcclient/rpcclient',
- source=RPCCLIENT_SRC,
+ source='''rpcclient/rpcclient.c
+ rpcclient/cmd_lsarpc.c
+ rpcclient/cmd_samr.c
+ rpcclient/cmd_spoolss.c
+ rpcclient/cmd_netlogon.c
+ rpcclient/cmd_srvsvc.c
+ rpcclient/cmd_dfs.c
+ rpcclient/cmd_epmapper.c
+ rpcclient/cmd_dssetup.c
+ rpcclient/cmd_echo.c
+ rpcclient/cmd_shutdown.c
+ rpcclient/cmd_test.c
+ rpcclient/cmd_wkssvc.c
+ rpcclient/cmd_ntsvcs.c
+ rpcclient/cmd_drsuapi.c
+ rpcclient/cmd_eventlog.c
+ rpcclient/cmd_winreg.c
+ rpcclient/cmd_fss.c''',
deps='''
talloc
popt_samba3
@@ -1138,9 +1143,8 @@ bld.SAMBA3_BINARY('rpcclient/rpcclient',
RPC_NDR_NTSVCS
RPC_NDR_EVENTLOG
INIT_SAMR
- RPC_NDR_FSRVP
- ''',
- vars=locals())
+ RPC_NDR_FSRVP
+ ''')
bld.SAMBA3_BINARY('client/smbclient',
source='''client/client.c
--
1.7.9.5
From 8b4a983f2a8bc0a2a4ef0f10b29fe94ea43cbb7d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:38:19 +0200
Subject: [PATCH 072/101] build: remove unused variable
LIBSMBCLIENT_THREAD_SRC
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 3 ---
1 file changed, 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 5d6c878..a306e76 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBSMBCLIENT_THREAD_SRC = '''libsmb/libsmb_thread_impl.c
- libsmb/libsmb_thread_posix.c'''
-
LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
--
1.7.9.5
From a21a97c5e452ec47e7d7d85b61dcba9085c4d678 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:39:10 +0200
Subject: [PATCH 073/101] build: list sources of library smbsharemodes
directly in def, remov vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index a306e76..b1ca2cf 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c'
-
-LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
-
LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
@@ -182,13 +178,12 @@ bld.SAMBA3_LIBRARY('netapi',
vnum='0')
bld.SAMBA3_LIBRARY('smbsharemodes',
- source=LIBSMBSHAREMODES_SRC,
+ source='libsmb/smb_share_modes.c',
public_deps='''talloc tdb_compat''',
deps='''ccan-hash''',
public_headers='include/smb_share_modes.h',
pc_files='libsmb/smbsharemodes.pc',
- vnum='0',
- vars=locals())
+ vnum='0')
bld.SAMBA3_LIBRARY('nss_wins',
source=WINBIND_WINS_NSS_SRC,
--
1.7.9.5
From d0f7d1766a9bbd587e22d1be21c6058a8fd824eb Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:40:28 +0200
Subject: [PATCH 074/101] build: list sources of libsmbconf directly in def.
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b1ca2cf..c13bc36 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIB_SMBCONF_SRC = 'lib/smbconf/smbconf_init.c lib/smbconf/smbconf_reg.c'
-
SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
@@ -592,7 +590,8 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS',
deps='samba-util LIBAFS_SETTOKEN')
bld.SAMBA3_LIBRARY('smbconf',
- source=LIB_SMBCONF_SRC,
+ source='''lib/smbconf/smbconf_init.c
+ lib/smbconf/smbconf_reg.c''',
deps='''
CHARSET3
LIBSMBCONF
--
1.7.9.5
From dbc5d0aaa5de1a634671f5bb4afc9d29a4237c0f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:41:22 +0200
Subject: [PATCH 075/101] build: list sources of binary smbconftort directly
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index c13bc36..f9249c0 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBCONFTORT_SRC0 = 'lib/smbconf/testsuite.c'
-
-SMBCONFTORT_SRC = '''${SMBCONFTORT_SRC0}'''
-
LIBNET_SRC = 'libnet/libnet_join.c'
@@ -1308,13 +1304,12 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
vars=locals())
bld.SAMBA3_BINARY('smbconftort',
- source=SMBCONFTORT_SRC,
+ source='lib/smbconf/testsuite.c',
deps='''
talloc
param
popt_samba3''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('replacetort',
source='../lib/replace/test/main.c',
--
1.7.9.5
From bef742aacd7e8c1099c39854c58b002e230a3cf3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:42:22 +0200
Subject: [PATCH 076/101] build: list source of subsys LIBNET directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f9249c0..b62e6de 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBNET_SRC = 'libnet/libnet_join.c'
-
-
LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
libnet/libnet_dssync_passdb.c
libnet/libnet_dssync_keytab.c'''
@@ -795,9 +792,8 @@ bld.SAMBA3_SUBSYSTEM('FNAME_UTIL',
deps='samba-util')
bld.SAMBA3_SUBSYSTEM('LIBNET',
- source=LIBNET_SRC,
- deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb',
- vars=locals())
+ source='libnet/libnet_join.c',
+ deps='NDR_LIBNET_JOIN INIT_SAMR net_keytab pdb')
bld.SAMBA3_LIBRARY('net_keytab',
source='libnet/libnet_keytab.c',
--
1.7.9.5
From c4f5c9dbd14f54151d93dcb6107c5d9136a0186f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:43:33 +0200
Subject: [PATCH 077/101] build: list source of subsys LIBNET_DSSYNC directly
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b62e6de..1bff74d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBNET_DSSYNC_SRC = '''libnet/libnet_dssync.c
- libnet/libnet_dssync_passdb.c
- libnet/libnet_dssync_keytab.c'''
-
LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
libnet/libnet_samsync_ldif.c
libnet/libnet_samsync_passdb.c
@@ -803,9 +799,10 @@ bld.SAMBA3_LIBRARY('net_keytab',
bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
- source=LIBNET_DSSYNC_SRC,
- deps='LIBNET RPC_NDR_DRSUAPI',
- vars=locals())
+ 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_SAMSYNC_SRC,
--
1.7.9.5
From 61625e85f99d99a38eb13619ab9fb83e8b387fc8 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:44:25 +0200
Subject: [PATCH 078/101] build: list sources of subsys LIBNET_SAMSYNC
directly in dev, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 15 ++++++---------
1 file changed, 6 insertions(+), 9 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 1bff74d..795361a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,12 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LIBNET_SAMSYNC_SRC = '''libnet/libnet_samsync.c
- libnet/libnet_samsync_ldif.c
- libnet/libnet_samsync_passdb.c
- libnet/libnet_samsync_display.c
- libnet/libnet_samsync_keytab.c'''
-
NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
utils/net_time.c utils/net_lookup.c
@@ -805,9 +799,12 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_DSSYNC',
deps='LIBNET RPC_NDR_DRSUAPI')
bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
- source=LIBNET_SAMSYNC_SRC,
- deps='LIBNET LIBCLI_SAMSYNC',
- vars=locals())
+ 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',
--
1.7.9.5
From 933a356169d98455683a25072f15b2f1c4f6e731 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:47:36 +0200
Subject: [PATCH 079/101] build: list sources of binary net directly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 81 +++++++++++++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 33 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 795361a..0c81f82 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,36 +3,6 @@
from samba_utils import *
import samba_version, samba3
-NET_SRC1 = '''utils/net.c utils/net_ads.c utils/net_help.c
- utils/net_rap.c utils/net_rpc.c utils/net_rpc_samsync.c
- utils/net_time.c utils/net_lookup.c
- utils/net_cache.c utils/net_groupmap.c
- utils/net_idmap.c utils/net_idmap_check.c
- utils/interact.c
- utils/net_status.c utils/net_rpc_printer.c utils/net_rpc_rights.c
- utils/net_rpc_service.c utils/net_rpc_registry.c utils/net_usershare.c
- utils/netlookup.c utils/net_sam.c utils/net_rpc_shell.c
- utils/net_util.c utils/net_rpc_sh_acct.c utils/net_rpc_audit.c
- utils/net_dns.c utils/net_ads_gpo.c
- utils/net_conf.c utils/net_join.c utils/net_user.c
- utils/net_group.c utils/net_file.c utils/net_registry.c
- utils/net_registry_check.c
- utils/net_dom.c utils/net_share.c
- utils/net_g_lock.c
- utils/net_serverid.c
- utils/net_eventlog.c
- utils/net_printing.c
- utils/net_rpc_trust.c
- utils/net_rpc_conf.c
- registry/reg_parse.c registry/reg_format.c
- registry/reg_import.c
- '''
-
-NET_SRC2 = 'utils/net_registry_util.c utils/net_help_common.c'
-
-NET_SRC = '''${NET_SRC1}
- ${NET_SRC2}'''
-
CUPS_SRC = '''client/smbspool.c'''
NMBLOOKUP_SRC = '''utils/nmblookup.c'''
@@ -1139,7 +1109,53 @@ bld.SAMBA3_BINARY('client/smbclient',
cli_smb_common''')
bld.SAMBA3_BINARY('net',
- source=NET_SRC,
+ source='''utils/net.c
+ utils/net_ads.c
+ utils/net_help.c
+ utils/net_rap.c
+ utils/net_rpc.c
+ utils/net_rpc_samsync.c
+ utils/net_time.c
+ utils/net_lookup.c
+ utils/net_cache.c
+ utils/net_groupmap.c
+ utils/net_idmap.c
+ utils/net_idmap_check.c
+ utils/interact.c
+ utils/net_status.c
+ utils/net_rpc_printer.c
+ utils/net_rpc_rights.c
+ utils/net_rpc_service.c
+ utils/net_rpc_registry.c
+ utils/net_usershare.c
+ utils/netlookup.c
+ utils/net_sam.c
+ utils/net_rpc_shell.c
+ utils/net_util.c
+ utils/net_rpc_sh_acct.c
+ utils/net_rpc_audit.c
+ utils/net_dns.c
+ utils/net_ads_gpo.c
+ utils/net_conf.c
+ utils/net_join.c
+ utils/net_user.c
+ utils/net_group.c
+ utils/net_file.c
+ utils/net_registry.c
+ utils/net_registry_check.c
+ utils/net_dom.c
+ utils/net_share.c
+ utils/net_g_lock.c
+ utils/net_serverid.c
+ utils/net_eventlog.c
+ utils/net_printing.c
+ utils/net_rpc_trust.c
+ utils/net_rpc_conf.c
+ registry/reg_parse.c
+ registry/reg_format.c
+ registry/reg_import.c
+ utils/net_registry_util.c
+ utils/net_help_common.c''',
deps='''
talloc
netapi
@@ -1176,8 +1192,7 @@ bld.SAMBA3_BINARY('net',
RPC_NDR_DSSETUP
RPC_NDR_INITSHUTDOWN
printing_migrate
- trusts_util''',
- vars=locals())
+ trusts_util''')
bld.SAMBA3_BINARY('profiles',
source='utils/profiles.c',
--
1.7.9.5
From dc3592fdc8969c2dee43a2b7f7d9d46e2ea70845 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:48:26 +0200
Subject: [PATCH 080/101] build: list source of binary smbspool directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 0c81f82..abafe29 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-CUPS_SRC = '''client/smbspool.c'''
-
NMBLOOKUP_SRC = '''utils/nmblookup.c'''
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
@@ -1203,14 +1201,13 @@ bld.SAMBA3_BINARY('profiles',
REGFIO''')
bld.SAMBA3_BINARY('smbspool',
- source=CUPS_SRC,
+ source='client/smbspool.c',
deps='''
talloc
popt_samba3
param
libsmb
- samba3core''',
- vars=locals())
+ samba3core''')
bld.SAMBA3_BINARY('testparm',
source='utils/testparm.c',
--
1.7.9.5
From 23a543514385466fb82363a4bf10bc164f11c25f Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:49:10 +0200
Subject: [PATCH 081/101] build: list source of binary nmblookup directly in
source, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index abafe29..7e5cd1f 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-NMBLOOKUP_SRC = '''utils/nmblookup.c'''
-
SMBTORTURE_SRC1 = '''torture/torture.c torture/nbio.c torture/scanner.c torture/utable.c
torture/denytest.c torture/mangle_test.c
torture/nbench.c
@@ -1280,13 +1278,12 @@ bld.SAMBA3_BINARY('smbget',
smbclient''')
bld.SAMBA3_BINARY('nmblookup',
- source=NMBLOOKUP_SRC,
+ source='utils/nmblookup.c',
deps='''
talloc
param
popt_samba3
- LIBNMB''',
- vars=locals())
+ LIBNMB''')
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
source=SMBTORTURE_SRC,
--
1.7.9.5
From 1b1be15c6a42736055c86880af9a6297ce3f5725 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:50:57 +0200
Subject: [PATCH 082/101] build: list sources of smbtorture(3) directly in
dev, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 65 ++++++++++++++++++++++++-------------------------
1 file changed, 32 insertions(+), 33 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 7e5cd1f..479b382 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,34 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBTORTURE_SRC1 = '''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_ctdbconn.c
- torture/test_msg.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/t_strappend.c'''
-
-SMBTORTURE_SRC = '''${SMBTORTURE_SRC1}
- torture/wbc_async.c'''
-
MSGTEST_SRC = '''torture/msgtest.c'''
PDBTEST_SRC = '''torture/pdbtest.c'''
@@ -1286,7 +1258,35 @@ bld.SAMBA3_BINARY('nmblookup',
LIBNMB''')
bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
- source=SMBTORTURE_SRC,
+ 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_ctdbconn.c
+ torture/test_msg.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/t_strappend.c
+ torture/wbc_async.c''',
deps='''
talloc
param
@@ -1296,11 +1296,10 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3,
RPC_NDR_ECHO
WB_REQTRANS
LOCKING
- NDR_OPEN_FILES
- idmap
+ NDR_OPEN_FILES
+ idmap
''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('smbconftort',
source='lib/smbconf/testsuite.c',
--
1.7.9.5
From 6f2c2e26d23c7e6af6bc7ec03d61ac70781a2a61 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:51:54 +0200
Subject: [PATCH 083/101] build: list source of binary msgtest direcly in def,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 479b382..4161c87 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-MSGTEST_SRC = '''torture/msgtest.c'''
-
PDBTEST_SRC = '''torture/pdbtest.c'''
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
@@ -1315,12 +1313,11 @@ bld.SAMBA3_BINARY('replacetort',
install=False)
bld.SAMBA3_BINARY('msgtest',
- source=MSGTEST_SRC,
+ source='torture/msgtest.c',
deps='''
talloc
param''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
--
1.7.9.5
From 0e13de6e615dd2269e9a5ea549f0214b960b1cf1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:52:44 +0200
Subject: [PATCH 084/101] build: list source of binary pdbtest directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 4161c87..b868e4e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-PDBTEST_SRC = '''torture/pdbtest.c'''
-
VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
torture/vfstest_chain.c'''
@@ -1355,15 +1353,14 @@ bld.SAMBA3_BINARY('sharesec',
vars=locals())
bld.SAMBA3_BINARY('pdbtest',
- source=PDBTEST_SRC,
+ source='torture/pdbtest.c',
deps='''
talloc
pdb
popt_samba3
AUTH_COMMON
auth''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('vfstest',
source=VFSTEST_SRC,
--
1.7.9.5
From 12f00076ab04b32263aa9d8cc7c5c2ea30da8038 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:53:43 +0200
Subject: [PATCH 085/101] build: list sources of binary vfstest directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b868e4e..4884673 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-VFSTEST_SRC = '''torture/cmd_vfs.c torture/vfstest.c
- torture/vfstest_chain.c'''
-
LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
LOCKTEST2_SRC = '''torture/locktest2.c'''
@@ -1363,13 +1360,14 @@ bld.SAMBA3_BINARY('pdbtest',
install=False)
bld.SAMBA3_BINARY('vfstest',
- source=VFSTEST_SRC,
+ source='''torture/cmd_vfs.c
+ torture/vfstest.c
+ torture/vfstest_chain.c''',
deps='''
vfs
popt_samba3
SMBREADLINE''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('log2pcap',
source=LOG2PCAP_SRC,
--
1.7.9.5
From 15b73d7e1739f1fd386698646a4d6c82f6ed9767 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:54:28 +0200
Subject: [PATCH 086/101] build: list source of binary log2pcap directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 4884673..9a5a9bf 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LOG2PCAP_SRC = '''utils/log2pcaphex.c'''
-
LOCKTEST2_SRC = '''torture/locktest2.c'''
SMBCACLS_SRC = '''utils/smbcacls.c'''
@@ -1370,10 +1368,9 @@ bld.SAMBA3_BINARY('vfstest',
install=False)
bld.SAMBA3_BINARY('log2pcap',
- source=LOG2PCAP_SRC,
+ source='utils/log2pcaphex.c',
deps='''talloc popt''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('locktest2',
source=LOCKTEST2_SRC,
--
1.7.9.5
From 363174804f514251f7cdf2b94ec47bb497687088 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:55:14 +0200
Subject: [PATCH 087/101] build: list source of binary locktest2 directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 9a5a9bf..1177ed5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-LOCKTEST2_SRC = '''torture/locktest2.c'''
-
SMBCACLS_SRC = '''utils/smbcacls.c'''
SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
@@ -1373,14 +1371,13 @@ bld.SAMBA3_BINARY('log2pcap',
install=False)
bld.SAMBA3_BINARY('locktest2',
- source=LOCKTEST2_SRC,
+ source='torture/locktest2.c',
deps='''
talloc
param
libsmb
LOCKING''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('debug2html',
source=DEBUG2HTML_SRC,
--
1.7.9.5
From f6483d0a932d3cc56cfc8a2ba1eb0e6423b69e02 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:55:56 +0200
Subject: [PATCH 088/101] build: list source of binary smbcacls directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 1177ed5..b7d73d9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBCACLS_SRC = '''utils/smbcacls.c'''
-
SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
@@ -1311,14 +1309,13 @@ bld.SAMBA3_BINARY('msgtest',
install=False)
bld.SAMBA3_BINARY('smbcacls',
- source=SMBCACLS_SRC,
+ source='utils/smbcacls.c',
deps='''
talloc
popt_samba3
msrpc3
libcli_lsa3
- krb5samba''',
- vars=locals())
+ krb5samba''')
bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
--
1.7.9.5
From 9f270c8b7ebf2daf0a470cb87fe112a3b54a815e Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:56:53 +0200
Subject: [PATCH 089/101] build: list source of binary smbcquotas directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b7d73d9..4217ed2 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBCQUOTAS_SRC = '''utils/smbcquotas.c'''
-
EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
@@ -1318,14 +1316,13 @@ bld.SAMBA3_BINARY('smbcacls',
krb5samba''')
bld.SAMBA3_BINARY('smbcquotas',
- source=SMBCQUOTAS_SRC,
+ source='utils/smbcquotas.c',
deps='''
talloc
popt_samba3
libsmb
msrpc3
- libcli_lsa3''',
- vars=locals())
+ libcli_lsa3''')
bld.SAMBA3_BINARY('eventlogadm',
source=EVTLOGADM_SRC,
--
1.7.9.5
From 73b189725557b3b7a085cfeef0d0b1b253cb6c29 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:57:41 +0200
Subject: [PATCH 090/101] build: list source of binary eventlogadm directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 4217ed2..39c4c2b 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-EVTLOGADM_SRC0 = 'utils/eventlogadm.c'
-
-EVTLOGADM_SRC = '''${EVTLOGADM_SRC0}'''
-
SHARESEC_SRC0 = 'utils/sharesec.c'
SHARESEC_SRC = '''${SHARESEC_SRC0}'''
@@ -1325,12 +1321,11 @@ bld.SAMBA3_BINARY('smbcquotas',
libcli_lsa3''')
bld.SAMBA3_BINARY('eventlogadm',
- source=EVTLOGADM_SRC,
+ source='utils/eventlogadm.c',
deps='''
talloc
param
- LIBEVENTLOG''',
- vars=locals())
+ LIBEVENTLOG''')
bld.SAMBA3_BINARY('sharesec',
source=SHARESEC_SRC,
--
1.7.9.5
From 761553c83d03f791e7b4fe81959f45356f9a63e5 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:58:30 +0200
Subject: [PATCH 091/101] build: list source of binary sharesec() directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 39c4c2b..90695d6 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,9 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SHARESEC_SRC0 = 'utils/sharesec.c'
-SHARESEC_SRC = '''${SHARESEC_SRC0}'''
-
DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
SMBFILTER_SRC = '''utils/smbfilter.c'''
@@ -1328,11 +1325,10 @@ bld.SAMBA3_BINARY('eventlogadm',
LIBEVENTLOG''')
bld.SAMBA3_BINARY('sharesec',
- source=SHARESEC_SRC,
+ source='utils/sharesec.c',
deps='''
talloc
- popt_samba3''',
- vars=locals())
+ popt_samba3''')
bld.SAMBA3_BINARY('pdbtest',
source='torture/pdbtest.c',
--
1.7.9.5
From 2d85c3920e2923550cdf53e5b4a2034ee4f6389a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 09:59:38 +0200
Subject: [PATCH 092/101] build: list sources of binary debug2html directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 90695d6..8cd7d26 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-DEBUG2HTML_SRC = '''utils/debug2html.c utils/debugparse.c'''
-
SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
@@ -1365,10 +1363,9 @@ bld.SAMBA3_BINARY('locktest2',
install=False)
bld.SAMBA3_BINARY('debug2html',
- source=DEBUG2HTML_SRC,
+ source='''utils/debug2html.c utils/debugparse.c''',
deps='''talloc popt''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('smbfilter',
source=SMBFILTER_SRC,
--
1.7.9.5
From 981da9d0bc2072f69ead58726c59ebec3d8da57a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:00:21 +0200
Subject: [PATCH 093/101] build: list source of binary smbfilter directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 8cd7d26..f817272 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SMBFILTER_SRC = '''utils/smbfilter.c'''
-
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
@@ -1368,13 +1366,12 @@ bld.SAMBA3_BINARY('debug2html',
install=False)
bld.SAMBA3_BINARY('smbfilter',
- source=SMBFILTER_SRC,
+ source='utils/smbfilter.c',
deps='''
talloc
param
LIBNMB''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('versiontest',
source='lib/version_test.c',
--
1.7.9.5
From 38debdcb048b573db0b69f330de29c8dc9c9082a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:01:07 +0200
Subject: [PATCH 094/101] build: list sources of library nss_wins directly in
dev
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index f817272..8407c2a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
-
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
@@ -79,7 +77,7 @@ bld.SAMBA3_LIBRARY('smbsharemodes',
vnum='0')
bld.SAMBA3_LIBRARY('nss_wins',
- source=WINBIND_WINS_NSS_SRC,
+ source='../nsswitch/wins.c',
deps='''param libsmb LIBTSOCKET''',
realname='libnss_wins.so.2',
soname='libnss_wins.so',
--
1.7.9.5
From 11e4e87cccfee413881b817cecc5a21a9a693c53 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:02:11 +0200
Subject: [PATCH 095/101] build: list sources of binary ntlm_auth directly in
dev, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 8407c2a..95775c4 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,10 +3,6 @@
from samba_utils import *
import samba_version, samba3
-NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
-
-NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
-
VLP_SRC = '''printing/tests/vlp.c'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -1380,15 +1376,14 @@ bld.SAMBA3_BINARY('versiontest',
vars=locals())
bld.SAMBA3_BINARY('ntlm_auth',
- source=NTLM_AUTH_SRC,
+ source='''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''',
deps='''
talloc
krb5samba
iniparser
libsmb
popt_samba3
- LIBNTLMSSP gse gensec''',
- vars=locals())
+ LIBNTLMSSP gse gensec''')
bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
--
1.7.9.5
From c8697feba6fb10fd763a3823fe52b119e28c73e3 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:03:08 +0200
Subject: [PATCH 096/101] build: list source of binary vlp directly in dev,
remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 95775c4..80d1c47 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-VLP_SRC = '''printing/tests/vlp.c'''
-
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
@@ -1430,12 +1428,11 @@ bld.SAMBA3_BINARY('split_tokens',
vars=locals())
bld.SAMBA3_BINARY('vlp',
- source=VLP_SRC,
+ source='printing/tests/vlp.c',
deps='''
talloc
param''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_PYTHON('pysmbd',
source='smbd/pysmbd.c',
--
1.7.9.5
From 984ef3203b14c8573c63b5c7983d9747c181ff32 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:04:04 +0200
Subject: [PATCH 097/101] build: list source of binary rpc_open_tcp directly
in dev, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 80d1c47..8e1e05d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
-
DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
@@ -1389,12 +1387,11 @@ bld.SAMBA3_BINARY('timelimit',
vars=locals())
bld.SAMBA3_BINARY('rpc_open_tcp',
- source=RPC_OPEN_TCP_SRC,
+ source='torture/rpc_open_tcp.c',
deps='''
talloc
msrpc3''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('test_lp_load',
source='param/test_lp_load.c',
--
1.7.9.5
From d1bbde4a68382043c15aab456668fb26b6e0b7a2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:04:53 +0200
Subject: [PATCH 098/101] build: list source of binary dbwrap_tool directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 8e1e05d..0151b0d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-DBWRAP_TOOL_SRC = 'utils/dbwrap_tool.c'
-
DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
@@ -1402,11 +1400,10 @@ bld.SAMBA3_BINARY('test_lp_load',
install=False)
bld.SAMBA3_BINARY('dbwrap_tool',
- source=DBWRAP_TOOL_SRC,
+ source='utils/dbwrap_tool.c',
deps='''
talloc
- popt_samba3''',
- vars=locals())
+ popt_samba3''')
bld.SAMBA3_BINARY('dbwrap_torture',
source=DBWRAP_TORTURE_SRC,
--
1.7.9.5
From 78da97b5aaf2907a5e1f1039c3e8e1b1f05dceeb Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:05:43 +0200
Subject: [PATCH 099/101] build: list source of dbwrap_torture directly in
def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 0151b0d..14373a9 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-DBWRAP_TORTURE_SRC = 'utils/dbwrap_torture.c'
-
SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
LIBS='ICONV'
@@ -1406,12 +1404,11 @@ bld.SAMBA3_BINARY('dbwrap_tool',
popt_samba3''')
bld.SAMBA3_BINARY('dbwrap_torture',
- source=DBWRAP_TORTURE_SRC,
+ source='utils/dbwrap_torture.c',
deps='''
talloc
popt_samba3''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
--
1.7.9.5
From a24d04f632bed8d8b7e1f30593b58768cd4da3f1 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:06:38 +0200
Subject: [PATCH 100/101] build: list source of binary split_tokens directly
in def, remove vars=locals()
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index 14373a9..b612011 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,8 +3,6 @@
from samba_utils import *
import samba_version, samba3
-SPLIT_TOKENS_SRC = 'utils/split_tokens.c'
-
LIBS='ICONV'
config_h = "../include/config.h"
@@ -1411,12 +1409,11 @@ bld.SAMBA3_BINARY('dbwrap_torture',
install=False)
bld.SAMBA3_BINARY('split_tokens',
- source=SPLIT_TOKENS_SRC,
+ source='utils/split_tokens.c',
deps='''
talloc
popt_samba3''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('vlp',
source='printing/tests/vlp.c',
--
1.7.9.5
From dbb6a6e3cd60d1a4f0a227e1677031490a708b0d Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox at samba.org>
Date: Mon, 23 Sep 2013 10:11:18 +0200
Subject: [PATCH 101/101] build: remove remaining occurrences of vars=locals()
of source3/wscript_build
Signed-off-by: Michael Adam <obnox at samba.org>
---
source3/wscript_build | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/source3/wscript_build b/source3/wscript_build
index b612011..02d9a1a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -190,8 +190,7 @@ bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
bld.SAMBA3_SUBSYSTEM('LOADPARM_CTX',
source='param/loadparm_ctx.c',
- deps='''talloc s3_param_h param''',
- vars=locals())
+ deps='''talloc s3_param_h param''')
bld.SAMBA_GENERATOR('param/param_global_h',
source= '../script/mkparamdefs.pl param/loadparm.c ../lib/param/param_functions.c',
@@ -365,8 +364,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
bld.SAMBA3_SUBSYSTEM('auth_generic',
source='libsmb/auth_generic.c',
- deps='LIBNTLMSSP gse gensec',
- vars=locals())
+ deps='LIBNTLMSSP gse gensec')
bld.SAMBA3_LIBRARY('libsmb',
source='''libsmb/clientgen.c
@@ -410,8 +408,7 @@ bld.SAMBA3_LIBRARY('libsmb',
bld.SAMBA3_SUBSYSTEM('CLDAP',
source='libads/cldap.c',
- deps='cli-ldap-common cli_cldap LIBTSOCKET',
- vars=locals())
+ deps='cli-ldap-common cli_cldap LIBTSOCKET')
# NOTE: The secrets3 library is a low level library used by several subsystems.
# PLEASE DO NOT make it depend on high level libraries like PDB, if you are
@@ -653,7 +650,6 @@ 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',
- vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('PRINTING',
@@ -684,7 +680,6 @@ bld.SAMBA3_SUBSYSTEM('LIBNET',
bld.SAMBA3_LIBRARY('net_keytab',
source='libnet/libnet_keytab.c',
deps='krb5samba ads',
- vars=locals(),
private_library=True)
@@ -752,13 +747,11 @@ bld.SAMBA3_SUBSYSTEM('DCUTIL',
bld.SAMBA3_LIBRARY('trusts_util',
source='libsmb/trusts_util.c',
deps='libcli_netlogon3 msrpc3 pdb',
- vars=locals(),
private_library=True)
bld.SAMBA3_SUBSYSTEM('tdb-wrap3',
source='lib/util_tdb.c',
- deps='talloc samba3-util',
- vars=locals())
+ 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/memcache.c lib/namearray.c lib/file_id.c''',
@@ -1362,8 +1355,7 @@ bld.SAMBA3_BINARY('versiontest',
deps='''
SAMBA_VERSION
param''',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('ntlm_auth',
source='''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c''',
@@ -1377,8 +1369,7 @@ bld.SAMBA3_BINARY('ntlm_auth',
bld.SAMBA3_BINARY('timelimit',
source='script/tests/timelimit.c',
- install=False,
- vars=locals())
+ install=False)
bld.SAMBA3_BINARY('rpc_open_tcp',
source='torture/rpc_open_tcp.c',
@@ -1440,8 +1431,7 @@ bld.SAMBA3_BINARY('samba-regedit',
utils/regedit_valuelist.c utils/regedit_dialog.c
utils/regedit_hexedit.c""",
deps='ncurses menu panel form registry param popt_samba3 smbregistry',
- enabled=bld.env.build_regedit,
- vars=locals())
+ enabled=bld.env.build_regedit)
########################## INCLUDES #################################
--
1.7.9.5
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 215 bytes
Desc: Digital signature
URL: <http://lists.samba.org/pipermail/samba-technical/attachments/20130923/9ba7b651/attachment-0001.pgp>
More information about the samba-technical
mailing list