[SCM] Samba Shared Repository - branch master updated
Kai Blin
kai at samba.org
Thu May 20 14:32:18 MDT 2010
The branch, master has been updated
via 29f549e... s3-waf: ndr string functions moved to top level
via aca2b54... s3-waf: Fix the build after rebase
via 73f6fed... s3-waf: more elaborate host_os check for STAT_ST_BLOCKSIZE
via 9ab3316... s3-waf: fix linking of eventlogadm by adding cap as dependency
via f35bafe... s3-waf: fix linking of swat by adding cap as dependency
via c33ba1f... s3-waf: Fix build with ldap by adding a SMBLDAP subsystem
via 17b136a... s3-waf: fix the winbindd build again
via b6c5d5d... s3-waf: Fix up PIDL includes.
via 9cc39ff... s3-waf: Some files moved during the rebase
via 5556deee7. s3-waf: Add autogeneration with PIDL
via d704d52... s3-waf: Remove references to LDB
via 1c6ba85... s3-waf: Also include source4/ when looking for headers
via 8e04ad2... s3-waf: build shared modules as subsystems
via 2650198... s3-waf: autogenerate lists of static modules
via e48b73f... s3-waf: clean up includes
via 3ea211f... s3-waf: create a SECRETS subsystem
via 1e97982... s3-waf: clean up dependencies a little
via 9971145... s3-waf: tdb includes are in lib/tdb/include
via 6a32dbd... s3-waf: fix eventlogadm build with winbind
via 0e7e039... s3-waf: Autogenerate the static and dynamic init function calls
via 25f33a3... s3-waf: add popt and tdb include dirs to the includes list
via 63a3061... s3-waf: Fix up the winbindd build
via 015c090... s3-waf: add eventlogadm binary
via 0766128... s3-waf: Use a common subsystem for the kerberos client code
via 149167f... s3-waf: Use a common subsystem for samba-popt code
via f242a31... s3-waf: note that the options are broken
via b243116... s3-waf: replace all - with _ in the configuration option names
via be712a8... s3-waf: Build swat
via 8f9a3c9... s3-waf: build winbindd again
via cf0cea8... s3-waf: fix up the LDAP objects if LDAP isn't built
via 0cb9973... s3-waf: install swat files
via 5800e45... s3-waf: fixed install path for sbin binaries
via e86b212... s3-waf: fixed SWATDIR to match old build
via 2261e8c... s3-waf: Fix the minimal build
via c59da6e... s3-waf: Fix the build --with-ldap
via 4acb54c... s3-waf: Fix global includes to fix waf configure --help output
via 9496bdc... s3-waf: Introduce more subsystems to reduce build time
via c8c54af... s3-waf: Don't build winbindd when --without-winbind is set
via 23adc33... s3-waf: Get winbindd to build again with current master
via 4478413... s3-waf: Add dummy configuration option for pthreadpool
via 81967f5... s3-waf: Add dummy configuration option for utmp
via f4ff7a2... s3-waf: Add dummy configuration option for sendfile-support
via cba7fd1... s3-waf: Add dummy configuration options for quotas
via f4ebdc9... s3-waf: Add dummy configuration option for PAM
via 76e054b... s3-waf: Add configuration option for merged build
via 7ba5d2c... s3-waf: Fix install location of testparm and wbinfo
via 1defd6e... s3-waf: Build LDB as a subsystem
via c332a13... s3-waf: build testparm and winbindd
via 3728186... s3-waf dynconfig: s3 configfile default is $LIBDIR/smb.conf
via eea89dd... s3-waf: merged auth subsystem changes from master
via c85008e... s3-waf: move the KRB5_DEPRECATED check into lib/replace
via ca72265... s3-waf: Don't recurse into tsocket dir during configure
via 730c570... s3-waf: Add enable selftest configuration option
via 0077761... s3-waf: correctly handle the libcap dependency when libcap is not installed
via fa48325... s3-waf: build wbinfo using waf
via c7a1708... s3-waf: Add ctags command
via b14d86f... s3-waf: Build nmbd using waf as well
via 8e32f81... s3-waf: Support smbd build without ldap and kerberos
via d59df05... s3-waf: Allow building without ads/ldap/krb5 even if the libs are installed
via f860a12... build: Don't look for krb5.h in libreplace
via 771a8c1... s3-waf: Allow using --enable/--disable options as well
via 99a2171... s3-waf: correctly handle cups dependencies when cups development packages are not installed
via 3d1c0f1... s3-waf: Add helper that facilitates defining --with-x and --without-x options
via adfd1db... s3-waf: Fix the CUPS dependency
via 419873f... s3-waf: All sorts of nasty hacks to finally get smbd to build/link
via 538edd5... s3-waf: Add some more krb5 checks
via 1316fa7... s3-waf: Check for LDAP
via 2b5f82f... s3-waf: Move cups, ldap and krb5 checks to the end of the wscript file
via d3c9d29... s3-waf: Check for KRB5_DEPRECATED handling
via 6f6b320... s3-waf: Fake some defines that need to be set by configure options later
via a967dea... s3-waf: Add more objects trying to build smbd
via 5f87d5a... s3-waf: Added support dynconfig cflags
from a8a4fe0... Fix bug #7410 - samba sends "raw" inode number as uniqueid with unix extensions.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 29f549e3fb62b8b431aea5f9e53fc916ff121111
Author: Kai Blin <kai at samba.org>
Date: Thu May 20 22:30:24 2010 +0200
s3-waf: ndr string functions moved to top level
commit aca2b5461c47e6bb6449d7b09e36faa0025bb912
Author: Kai Blin <kai at samba.org>
Date: Thu May 20 10:24:37 2010 +0200
s3-waf: Fix the build after rebase
commit 73f6fed4d61f69cbbbd911e3c5549f39cea05ac7
Author: Kai Blin <kai at samba.org>
Date: Fri May 14 11:03:19 2010 +0200
s3-waf: more elaborate host_os check for STAT_ST_BLOCKSIZE
commit 9ab33162503ea5965cd7f34a9b5b9c1f13e75d0c
Author: Michael Adam <obnox at samba.org>
Date: Wed May 12 23:48:10 2010 +0200
s3-waf: fix linking of eventlogadm by adding cap as dependency
commit f35bafe39c9aac0c156636965bffa1ebe0b39225
Author: Michael Adam <obnox at samba.org>
Date: Wed May 12 23:47:36 2010 +0200
s3-waf: fix linking of swat by adding cap as dependency
commit c33ba1f9d1a5af5a2055cc28cd859bef75fa7eba
Author: Kai Blin <kai at samba.org>
Date: Wed May 12 22:43:18 2010 +0200
s3-waf: Fix build with ldap by adding a SMBLDAP subsystem
commit 17b136a79f94be5133e1fc93e31001fb102e6d2e
Author: Kai Blin <kai at samba.org>
Date: Wed May 12 05:39:00 2010 -0600
s3-waf: fix the winbindd build again
commit b6c5d5de379de1e1e5ada78021b3defba3ca3194
Author: Kai Blin <kai at samba.org>
Date: Wed May 12 05:23:27 2010 -0600
s3-waf: Fix up PIDL includes.
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
commit 9cc39ffb5673e17be78d3986c0cc56e4f1a2af32
Author: Kai Blin <kai at samba.org>
Date: Wed May 12 04:32:30 2010 -0600
s3-waf: Some files moved during the rebase
commit 5556deee7aabda43ee258d84670fcb9635632a47
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed May 12 04:31:27 2010 -0600
s3-waf: Add autogeneration with PIDL
commit d704d5295461a2d287f3d69b43d355fc4cfa1489
Author: Kai Blin <kai at samba.org>
Date: Wed May 12 04:27:49 2010 -0600
s3-waf: Remove references to LDB
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
commit 1c6ba8551d74a469c80fdc666a8c795bd3a7bf52
Author: Stefan Metzmacher <metze at samba.org>
Date: Wed May 12 04:23:10 2010 -0600
s3-waf: Also include source4/ when looking for headers
commit 8e04ad2db1e3071e3297a315021fc5158134f575
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 17:44:25 2010 +0200
s3-waf: build shared modules as subsystems
commit 2650198ff70320cc9f251f2ce881c25932bc0e95
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 17:14:54 2010 +0200
s3-waf: autogenerate lists of static modules
commit e48b73fc67e7e57d6944722adf738bcc923cf1a6
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 17:13:05 2010 +0200
s3-waf: clean up includes
commit 3ea211feb4b77633e22ecd09c8d653ccf892ec9f
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 17:11:41 2010 +0200
s3-waf: create a SECRETS subsystem
commit 1e97982633a4a7652d7481a0e888de4fe85c7791
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 15:24:13 2010 +0200
s3-waf: clean up dependencies a little
commit 997114564d1d8ec9e6f79be6e0cd557e34d04cb6
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 15:23:37 2010 +0200
s3-waf: tdb includes are in lib/tdb/include
commit 6a32dbd857b892a1c71130fdcb58ec53d06ea4ef
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 15:00:43 2010 +0200
s3-waf: fix eventlogadm build with winbind
commit 0e7e0397780a13b13649c910fe77709e4feedcf0
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 10:32:07 2010 +0200
s3-waf: Autogenerate the static and dynamic init function calls
commit 25f33a3f8e92e2687db782b56ad794e8dee02986
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 10:31:22 2010 +0200
s3-waf: add popt and tdb include dirs to the includes list
commit 63a30619b63d17347eda1c13e56ec200fa1ce853
Author: Kai Blin <kai at samba.org>
Date: Tue May 11 10:30:25 2010 +0200
s3-waf: Fix up the winbindd build
commit 015c09031e48877bda9b15d9334846d7fd43c98e
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 19:45:06 2010 +0200
s3-waf: add eventlogadm binary
commit 07661287648e4764a0babf6f571e695c61957b41
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:43:57 2010 +0200
s3-waf: Use a common subsystem for the kerberos client code
commit 149167f5748860e6795d11c6aceeb0149101d241
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:33:49 2010 +0200
s3-waf: Use a common subsystem for samba-popt code
commit f242a31a43a0ff2d0be84553aca5e159aa138905
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:22:06 2010 +0200
s3-waf: note that the options are broken
commit b2431163fccb996b390acbfd65d29d39f92b4679
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:21:28 2010 +0200
s3-waf: replace all - with _ in the configuration option names
commit be712a8eea486d493d6e0c924d1d8e13312a52af
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:18:20 2010 +0200
s3-waf: Build swat
commit 8f9a3c9eb2b79539d04c59ed4a5a570c692cd63c
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 14:17:30 2010 +0200
s3-waf: build winbindd again
commit cf0cea838fd3565b81062a502732c249382a1149
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 11:25:52 2010 +0200
s3-waf: fix up the LDAP objects if LDAP isn't built
commit 0cb99738ca81a54fab1c3c63bb24f3014314e925
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 18 06:43:01 2010 -0600
s3-waf: install swat files
commit 5800e45fdd8bed7744481d7ec3671d701cbfb41b
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 18 06:42:49 2010 -0600
s3-waf: fixed install path for sbin binaries
commit e86b2127395d389be131629050e391e9f37507ab
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Apr 18 06:42:20 2010 -0600
s3-waf: fixed SWATDIR to match old build
commit 2261e8c0876dc1fa6eba3ccaf8341122ede67505
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 10:15:11 2010 +0200
s3-waf: Fix the minimal build
When using the internal zlib and popt, the dependencies and includes
have to be adapted a bit
commit c59da6e9a5cd177aed8fac38bd170979339bae7f
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 30 02:07:28 2010 -0600
s3-waf: Fix the build --with-ldap
The LDAP source files as set by configure weren't detected correctly in the wscript_build
Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>
commit 4acb54c6a0a59ba03eeaa8807d114f8ec3743a9e
Author: Kai Blin <kai at samba.org>
Date: Fri Apr 23 08:59:43 2010 +0200
s3-waf: Fix global includes to fix waf configure --help output
commit 9496bdc04f942be117816746e9838c0e57fa759b
Author: Kai Blin <kai at samba.org>
Date: Thu Apr 22 23:33:38 2010 +0200
s3-waf: Introduce more subsystems to reduce build time
commit c8c54af69ea032a00f27750928df6cd129011eec
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 22:31:35 2010 +0200
s3-waf: Don't build winbindd when --without-winbind is set
commit 23adc338fe3db0d975f12a2975133e14130b79a6
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 11:08:37 2010 +0200
s3-waf: Get winbindd to build again with current master
commit 4478413da9cff9c9c054351477724265e7e5a9f8
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 08:07:50 2010 +0200
s3-waf: Add dummy configuration option for pthreadpool
commit 81967f5087de6385142e1e3e05bbd17fd49c3691
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 08:04:12 2010 +0200
s3-waf: Add dummy configuration option for utmp
commit f4ff7a298d99d5a0c20b7d4c6d092faf00c898f1
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 08:03:38 2010 +0200
s3-waf: Add dummy configuration option for sendfile-support
commit cba7fd170cb08a8c200ca4d2fa5c19ba88213699
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 08:02:31 2010 +0200
s3-waf: Add dummy configuration options for quotas
commit f4ebdc98c2439269341e468613c89d6ece7db465
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 08:00:52 2010 +0200
s3-waf: Add dummy configuration option for PAM
commit 76e054ba988ec200ba140a6f9f5572d6c310bb40
Author: Kai Blin <kai at samba.org>
Date: Wed Apr 21 07:58:44 2010 +0200
s3-waf: Add configuration option for merged build
This doesn't enable the merged build, but doesn't error out when the --disable-merged-build configuration option is set
commit 7ba5d2c012cf028b871d29409743b973382bdabe
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 18 10:08:25 2010 +0200
s3-waf: Fix install location of testparm and wbinfo
commit 1defd6e2a8a80ce850f11bcc0401868fb3d92522
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 18 10:07:54 2010 +0200
s3-waf: Build LDB as a subsystem
commit c332a13d743a6e949f4b8d40e7d9440f7cc598d4
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 18 09:30:59 2010 +0200
s3-waf: build testparm and winbindd
commit 372818620248dfd48dd2cb2d49671a86e5564f6c
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 18 09:26:54 2010 +0200
s3-waf dynconfig: s3 configfile default is $LIBDIR/smb.conf
commit eea89ddf8d5340458743f6fdfa746343169b00af
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 12 00:05:40 2010 -0600
s3-waf: merged auth subsystem changes from master
commit c85008e0843f5b2af0a83ed0748af46873515446
Author: Andrew Tridgell <tridge at samba.org>
Date: Mon Apr 12 00:40:54 2010 -0600
s3-waf: move the KRB5_DEPRECATED check into lib/replace
this needs to be with the krb5.h check
commit ca7226500ce108fb00aed6280992ecbda16b9726
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 12 07:21:41 2010 +0200
s3-waf: Don't recurse into tsocket dir during configure
commit 730c57048edcc03480c3ff55de751d68775bd860
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Apr 8 13:05:36 2010 -0600
s3-waf: Add enable selftest configuration option
commit 0077761f7ec0e404e67ff602135e1b4189b4c5c6
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Apr 8 15:03:40 2010 -0600
s3-waf: correctly handle the libcap dependency when libcap is not installed
commit fa48325bb65749af87106d4e19e29be1f91e6477
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 23:01:29 2010 +0200
s3-waf: build wbinfo using waf
commit c7a17087402d5a177cd4b614e3c5255776e8c6d3
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 22:43:23 2010 +0200
s3-waf: Add ctags command
commit b14d86f0a90672aaa4ffb831c11f1a7df3e239f6
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 22:05:50 2010 +0200
s3-waf: Build nmbd using waf as well
commit 8e32f81d4d5ceee14b00fac97d529d372de220de
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 22:05:10 2010 +0200
s3-waf: Support smbd build without ldap and kerberos
commit d59df05ff9a2de0fd04922f9221726a442d91ffb
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 10:36:05 2010 +0200
s3-waf: Allow building without ads/ldap/krb5 even if the libs are installed
commit f860a12d2fe7522e6bfefd0485c7005c6a3b56fe
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 10:34:52 2010 +0200
build: Don't look for krb5.h in libreplace
commit 771a8c17afbb287297958de1f8a017c96507db78
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 10:34:12 2010 +0200
s3-waf: Allow using --enable/--disable options as well
commit 99a2171f8b7ea1e2fda1060e07b2d7cd0ba5c8ae
Author: Andrew Tridgell <tridge at samba.org>
Date: Thu Apr 8 15:04:55 2010 -0600
s3-waf: correctly handle cups dependencies when cups development packages are not installed
commit 3d1c0f1a2152b456be112ce992d281e0234f1a96
Author: Kai Blin <kai at samba.org>
Date: Sun Apr 11 09:35:08 2010 +0200
s3-waf: Add helper that facilitates defining --with-x and --without-x options
commit adfd1db476cb1c399d5146b47f432199c585666c
Author: Kai Blin <kai at samba.org>
Date: Thu Apr 8 08:09:11 2010 +0200
s3-waf: Fix the CUPS dependency
commit 419873f2ee9997edd06f95758f7ab10aa1a8d15b
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Apr 7 07:34:12 2010 -0600
s3-waf: All sorts of nasty hacks to finally get smbd to build/link
Pair-Programmed-With: Kai Blin <kai at samba.org>
commit 538edd5fc0668e08d955f75a3524811c1e987e93
Author: Kai Blin <kai at samba.org>
Date: Tue Apr 6 00:44:25 2010 +0200
s3-waf: Add some more krb5 checks
There is still quite a few of them missing.
commit 1316fa7b784b68bd066b649757e1e58901f6cade
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 5 23:44:37 2010 +0200
s3-waf: Check for LDAP
commit 2b5f82f259e9f6529567de54a347737587f0b2d6
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 5 14:41:23 2010 +0200
s3-waf: Move cups, ldap and krb5 checks to the end of the wscript file
commit d3c9d299e8d9bac8ab5504e61c99b4ad4a46afb0
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 5 14:40:10 2010 +0200
s3-waf: Check for KRB5_DEPRECATED handling
commit 6f6b32044e4aed9262f31ac30e18950036828ae8
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 5 14:39:07 2010 +0200
s3-waf: Fake some defines that need to be set by configure options later
commit a967deacdce516192a4faa4fdebcabca34923243
Author: Kai Blin <kai at samba.org>
Date: Mon Apr 5 01:34:43 2010 -0600
s3-waf: Add more objects trying to build smbd
commit 5f87d5a3d0390eb6c9139f78125d223f3a70b7ef
Author: Kai Blin <kai at samba.org>
Date: Fri Mar 26 16:52:32 2010 -0600
s3-waf: Added support dynconfig cflags
Pair-Programmed-With: Andrew Tridgell <tridge at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba3.py | 23 +
nsswitch/libwbclient/wscript_build | 3 +-
source3/build/dynconfig.py | 3 +-
source3/build/wscript | 29 +-
source3/librpc/idl/wscript_build | 7 +
source3/wscript | 213 +++++++-
source3/wscript_build | 935 +++++++++++++++++++++++++-----------
7 files changed, 897 insertions(+), 316 deletions(-)
create mode 100644 buildtools/wafsamba/samba3.py
create mode 100644 source3/librpc/idl/wscript_build
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
new file mode 100644
index 0000000..5fa4c0f
--- /dev/null
+++ b/buildtools/wafsamba/samba3.py
@@ -0,0 +1,23 @@
+# a waf tool to add autoconf-like macros to the configure section
+# and for SAMBA_ macros for building libraries, binaries etc
+
+import Options
+from optparse import SUPPRESS_HELP
+
+def SAMBA3_ADD_OPTION(opt, option, help=(), dest=None, default=True,
+ with_name="with", without_name="without"):
+ if help == ():
+ help = ("Build with %s support" % option)
+ if dest is None:
+ dest = "with_%s" % option.replace('-', '_')
+
+ with_val = "--%s-%s" % (with_name, option)
+ without_val = "--%s-%s" % (without_name, option)
+
+ #FIXME: This is broken and will always default to "default" no matter if
+ # --with or --without is chosen.
+ opt.add_option(with_val, help=help, action="store_true", dest=dest,
+ default=default)
+ opt.add_option(without_val, help=SUPPRESS_HELP, action="store_false",
+ dest=dest)
+Options.Handler.SAMBA3_ADD_OPTION = SAMBA3_ADD_OPTION
diff --git a/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index a4a8742..7d1ed2e 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -7,6 +7,7 @@ bld.SAMBA_SUBSYSTEM('LIBWBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_ASYNC',
source='wbc_async.c wbc_idmap_async.c wbc_pam_async.c wbc_sid_async.c wbc_util_async.c wb_reqtrans.c',
- public_deps='LIBASYNC_REQ tevent talloc UTIL_TEVENT LIBWBCLIENT'
+ public_deps='LIBASYNC_REQ tevent talloc UTIL_TEVENT LIBWBCLIENT',
+ enabled=False, # we don't have LIBASYNC_REQ yet
)
diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index 179af10..65798a3 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -26,8 +26,9 @@ dyn_cflags = {
'DATADIR' : '${DATADIR}',
'LOGFILEBASE' : '${LOCALSTATEDIR}',
'CONFIGDIR' : '${SYSCONFDIR}',
+ 'CONFIGFILE' : '${LIBDIR}/smb.conf',
'NCALRPCDIR' : '${LOCALSTATEDIR}/ncalrpc',
- 'SWATDIR' : '${DATADIR}/swat',
+ 'SWATDIR' : '${PREFIX}/swat',
'PRIVATE_DIR' : '${PRIVATEDIR}',
'MODULESDIR' : '${PREFIX}/modules',
'SETUPDIR' : '${DATADIR}/setup',
diff --git a/source3/build/wscript b/source3/build/wscript
index a4df794..f27e279 100644
--- a/source3/build/wscript
+++ b/source3/build/wscript
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-import Options
+import string, Utils, Options
from dynconfig import *
def set_options(opt):
@@ -14,6 +14,9 @@ def set_options(opt):
help=(help + ' [%s]' % default),
action="store", dest=varname, default=default)
+
+cflags_vars = [ 'CONFIGFILE' ]
+
def configure(conf):
# get all the basic GNU options from the gnu_dirs tool
conf.check_tool('gnu_dirs')
@@ -24,9 +27,31 @@ def configure(conf):
conf.ASSERT(varname not in conf.env, "Variable %s already defined" % varname)
conf.env[varname] = value
+ for f in dyn_cflags.keys():
+ # substitute twice, as we could have substitutions containing variables
+ v = Utils.subst_vars(dyn_cflags[f], conf.env)
+ v = Utils.subst_vars(v, conf.env)
+ conf.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+ conf.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
+ conf.env[f] = v
+ if f in cflags_vars:
+ conf.DEFINE(f, v, quote=True)
+
def build(bld):
cflags = dynconfig_cflags(bld)
bld.SAMBA_SUBSYSTEM('DYNCONFIG',
'../dynconfig.c',
- deps='replace talloc tdb',
+ deps='replace talloc tdb popt',
cflags=cflags)
+
+def dynconfig_cflags(bld):
+ '''work out the extra CFLAGS for dynconfig.c'''
+ cflags = []
+ for f in dyn_cflags.keys():
+ # substitute twice, as we could have substitutions containing variables
+ v = Utils.subst_vars(dyn_cflags[f], bld.env)
+ v = Utils.subst_vars(v, bld.env)
+ bld.ASSERT(v != '', "Empty dynconfig value for %s" % f)
+ bld.ASSERT(v.find('${') == -1, "Unsubstituted variable in %s : %s : %s" % (f, dyn_cflags[f], v))
+ cflags.append('-D%s="%s"' % (f, v))
+ return cflags
diff --git a/source3/librpc/idl/wscript_build b/source3/librpc/idl/wscript_build
new file mode 100644
index 0000000..3d1e258
--- /dev/null
+++ b/source3/librpc/idl/wscript_build
@@ -0,0 +1,7 @@
+
+bld.SAMBA_PIDL_LIST('PIDL',
+ '''messaging.idl libnetapi.idl notify.idl
+ wbint.idl perfcount.idl secrets.idl libnet_join.idl''',
+ options='--includedir=../librpc/idl --header --ndr-parser --samba3-ndr-server --samba3-ndr-client',
+ output_dir='../gen_ndr')
+
diff --git a/source3/wscript b/source3/wscript
index 6b669db..30736ad 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -4,10 +4,12 @@ srcdir = '..'
blddir = 'bin'
import sys, os
+from optparse import SUPPRESS_HELP
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, Options
import build.charset
-from samba_utils import *
+import samba_utils
+import samba3
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
@@ -16,7 +18,8 @@ def set_options(opt):
opt.RECURSE('build')
opt.RECURSE('../lib/nss_wrapper')
opt.RECURSE('../lib/socket_wrapper')
- opt.RECURSE('../lib/uid_wrapper')
+ opt.RECURSE('../lib/tevent')
+ opt.RECURSE('../lib/tdb')
opt.add_option('--with-static-modules',
help=("Comma-separated list of names of modules to statically link in"),
@@ -24,9 +27,28 @@ def set_options(opt):
opt.add_option('--with-shared-modules',
help=("Comma-separated list of names of modules to build shared"),
action="store", dest='shared_modules', default='')
+ opt.add_option('--enable-selftest',
+ help=("enable options necessary for selftest"),
+ action="store_true", dest='enable_selftest', default=False)
+
+ opt.SAMBA3_ADD_OPTION('winbind')
+ opt.SAMBA3_ADD_OPTION('swat')
+ opt.SAMBA3_ADD_OPTION('ads')
+ opt.SAMBA3_ADD_OPTION('krb5')
+ opt.SAMBA3_ADD_OPTION('ldap')
+ opt.SAMBA3_ADD_OPTION('cups', with_name="enable", without_name="disable")
+ opt.SAMBA3_ADD_OPTION('merged-build', with_name="enable", without_name="disable")
+ opt.SAMBA3_ADD_OPTION('pam')
+ opt.SAMBA3_ADD_OPTION('quotas')
+ opt.SAMBA3_ADD_OPTION('sys-quotas')
+ opt.SAMBA3_ADD_OPTION('sendfile-support')
+ opt.SAMBA3_ADD_OPTION('utmp')
+ opt.SAMBA3_ADD_OPTION('pthreadpool', with_name="enable", without_name="disable")
def configure(conf):
+ from samba_utils import TO_LIST
+
conf.define('PACKAGE_NAME', 'Samba')
conf.define('PACKAGE_STRING', 'Samba 3')
conf.define('PACKAGE_TARNAME', 'samba')
@@ -43,16 +65,19 @@ def configure(conf):
# set a limit on recursing in the waf preprocessor
conf.env.preprocessor_recursion_limit = 10
- conf.ADD_EXTRA_INCLUDES('#source3 #source3/include #lib/replace #lib/talloc #lib/tevent #source3/libaddns #source3/librpc')
+ conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace #lib/talloc
+ #lib/tevent #source3/libaddns #source3/librpc
+ #source3/lib #lib/tdb/include #lib/popt #source4''')
conf.RECURSE('../lib/replace')
conf.RECURSE('build')
conf.RECURSE('../lib/tdb')
conf.RECURSE('../lib/talloc')
conf.RECURSE('../lib/tevent')
+ conf.RECURSE('../lib/popt')
conf.RECURSE('../lib/nss_wrapper')
conf.RECURSE('../lib/socket_wrapper')
- conf.RECURSE('../lib/uid_wrapper')
+ conf.RECURSE('../lib/zlib')
conf.CHECK_HEADERS('execinfo.h libexc.h libunwind.h')
@@ -76,6 +101,9 @@ def configure(conf):
conf.CHECK_FUNCS('shmget')
conf.CHECK_FUNCS_IN('shm_open', 'rt', checklibc=True)
conf.CHECK_FUNCS('gettext dgettext bindtextdomain textdomain')
+ #FIXME: for some reason this one still fails
+ conf.CHECK_FUNCS_IN('yp_get_default_domain', 'nsl')
+ conf.CHECK_FUNCS_IN('dn_expand _dn_expand __dn_expand', 'resolv')
# Check for inotify support
conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h')
@@ -135,8 +163,9 @@ main() {
headers='sys/stat.h')
# Check for POSIX capability support
+ conf.CHECK_FUNCS_IN('cap_get_proc', 'cap', headers='sys/capability.h')
+
if "HAVE_SYS_CAPABILITY_H" in conf.env:
- conf.CHECK_FUNCS_IN('cap_get_proc', 'cap')
conf.CHECK_CODE('''
cap_t cap;
cap_value_t vals[1];
@@ -174,24 +203,6 @@ if (0) {
}''', 'HAVE_COMPILER_WILL_OPTIMIZE_OUT_FNS',
msg="Checking if the compiler will optimize out functions")
- # Look for CUPS
- conf.find_program('cups-config', var='CUPS_CONFIG')
- if conf.env.CUPS_CONFIG:
- conf.check_cfg(path="cups-config", args="--cflags --ldflags --libs", package="", uselib_store="CUPS")
- conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='CUPS')
-
- # Check for LDAP
- conf.CHECK_HEADERS('ldap.h lber.h')
- conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
-
- # Check for kerberos
- conf.find_program('krb5-config', var='KRB5_CONFIG')
- if conf.env.KRB5_CONFIG:
- conf.check_cfg(path="krb5-config", args="--cflags --libs",
- package="gssapi", uselib_store="KRB5")
- conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='KRB5')
- conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h', lib='KRB5')
-
conf.CHECK_FUNCS('''
_acl __acl add_proplist_entry atexit attr_getf attr_list attr_listf
attropen attr_remove attr_removef attr_set attr_setf backtrace_symbols
@@ -227,7 +238,6 @@ sizeof_proplist_entry _stat __stat stat64 _stat64 __stat64 statvfs
strcasecmp strchr strpbrk strsignal strtol strupr sysconf sysctlbyname
__sys_llseek syslog _telldir __telldir telldir64 textdomain timegm
updwtmp updwtmpx utimensat vsyslog _write __write __xstat
-yp_get_default_domain
''')
conf.CHECK_TYPE('struct timespec', headers='sys/time.h time.h')
@@ -269,20 +279,169 @@ yp_get_default_domain
conf.DEFINE('STRING_STATIC_MODULES', ' '.join(default_static_modules), quote=True)
static_list = {}
+ shared_list = {}
- prefixes = ['vfs', 'pdb', 'rpc', 'auth', 'nss_info', 'charset', 'idmap']
+ prefixes = ['vfs', 'pdb', 'rpc', 'auth', 'nss_info', 'charset', 'idmap', 'gpext', 'perfcount']
+ conf.env['MODULE_PREFIXES'] = prefixes
for p in prefixes:
for m in default_static_modules:
if m.find(p) == 0:
if not p in static_list:
static_list[p] = []
static_list[p].append(m)
+ for m in default_shared_modules:
+ if m.find(p) == 0:
+ if not p in shared_list:
+ shared_list[p] = []
+ shared_list[p].append(m)
for p in prefixes:
+ static_env = "%s_STATIC" % p.upper()
+ shared_env = "%s_SHARED" % p.upper()
+ conf.env[static_env] = []
+ conf.env[shared_env] = []
if p in static_list:
- conf.DEFINE('static_init_%s' % p, '{ %s_init(); }' % '_init(); '.join(static_list[p]))
+ decl_list=""
+ for entry in static_list[p]:
+ decl_list += "extern NTSTATUS %s_init(void); " % entry
+ conf.env[static_env].append('%s' % entry.upper())
+ decl_list = decl_list.rstrip()
+ conf.DEFINE('static_decl_%s' % p, decl_list)
+ conf.DEFINE('static_init_%s' % p, '{ %s_init(); }' % '_init(); '.join(static_list[p]))
else:
+ conf.DEFINE('static_decl_%s' % p, '')
conf.DEFINE('static_init_%s' % p, '{}')
+ if p in shared_list:
+ for entry in shared_list[p]:
+ conf.DEFINE('%s_init' % entry, 'init_samba_module')
+ conf.env[shared_env].append('%s' % entry.upper())
+
+ if Options.options.with_winbind:
+ conf.DEFINE('WITH_WINBIND', '1')
+
+ #FIXME: Should just be set when krb5 and ldap requirements are fulfilled
+ if Options.options.with_ads:
+ conf.DEFINE('WITH_ADS', '1')
+
+ # Look for CUPS
+ conf.find_program('cups-config', var='CUPS_CONFIG')
+ if conf.env.CUPS_CONFIG and Options.options.with_cups:
+ conf.check_cfg(path="cups-config", args="--cflags --ldflags --libs",
+ package="", uselib_store="cups")
+ conf.CHECK_HEADERS('cups/cups.h cups/language.h', lib='cups')
+ conf.CHECK_LIB('cups')
+ else:
+ # define an empty subsystem for cups, to allow it to be used as an empty dependency
+ conf.SET_TARGET_TYPE('cups', 'EMPTY')
+
+ # Check for LDAP
+ if Options.options.with_ldap:
+ conf.CHECK_HEADERS('ldap.h lber.h')
+ conf.CHECK_TYPE('ber_tag_t', 'unsigned int', headers='ldap.h lber.h')
+ conf.CHECK_FUNCS_IN('ber_scanf ber_sockbuf_add_io', 'lber')
+ conf.CHECK_VARIABLE('LDAP_OPT_SOCKBUF', headers='ldap.h')
+ # if ber_sockbuf_add_io() and LDAP_OPT_SOCKBUF are available, we can add
+ # SASL wrapping hooks
+ if conf.CONFIG_SET('HAVE_BER_SOCKBUF_ADD_IO') and \
+ conf.CONFIG_SET('HAVE_LDAP_OPT_SOCKBUF'):
+ conf.DEFINE('HAVE_LDAP_SASL_WRAPPING', '1')
+
+ # if we LBER_OPT_LOG_PRINT_FN we can intercept ldap logging and print it out
+ # for the samba logs
+ conf.CHECK_VARIABLE('LBER_OPT_LOG_PRINT_FN',
+ define='HAVE_LBER_LOG_PRINT_FN', headers='lber.h')
+
+ conf.CHECK_FUNCS_IN('ldap_init ldap_initialize ldap_set_rebind_proc', 'ldap')
+ conf.CHECK_FUNCS_IN('ldap_add_result_entry', 'ldap')
+
+ # Check if ldap_set_rebind_proc() takes three arguments
+ if conf.CHECK_CODE('ldap_set_rebind_proc(0, 0, 0)',
+ 'LDAP_SET_REBIND_PROC_ARGS',
+ msg="Checking whether ldap_set_rebind_proc takes 3 arguments",
+ headers='ldap.h lber.h', link=False):
+ conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '3')
+ else:
+ conf.DEFINE('LDAP_SET_REBIND_PROC_ARGS', '2')
+
+ # last but not least, if ldap_init() exists, we want to use ldap
+ if conf.CONFIG_SET('HAVE_LDAP_INIT'):
+ conf.DEFINE('HAVE_LDAP', '1')
+ conf.DEFINE('LDAP_DEPRECATED', '1')
+ conf.env['SMBLDAP'] = 'lib/smbldap.c'
+ conf.env['SMBLDAPUTIL'] = 'lib/smbldap_util.c'
+ else:
+ conf.SET_TARGET_TYPE('ldap', 'EMPTY')
+ conf.SET_TARGET_TYPE('lber', 'EMPTY')
+
+ # Check for kerberos
+ conf.find_program('krb5-config', var='KRB5_CONFIG')
+ if conf.env.KRB5_CONFIG and Options.options.with_krb5:
+ conf.check_cfg(path="krb5-config", args="--cflags --libs",
+ package="gssapi", uselib_store="krb5")
+ conf.CHECK_HEADERS('krb5.h krb5/locate_plugin.h', lib='krb5')
+ conf.CHECK_HEADERS('gssapi.h gssapi/gssapi_generic.h gssapi/gssapi.h com_err.h', lib='krb5')
+
+ if conf.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
+ conf.env['WINBIND_KRB5_LOCATOR'] = 'bin/winbind_krb5_locator.so'
+
+ conf.CHECK_FUNCS_IN('_et_list', 'com_err')
+ conf.CHECK_FUNCS_IN('krb5_encrypt_data', 'k5crypto')
+ conf.CHECK_FUNCS_IN('crypto', 'des_set_key')
+ conf.CHECK_FUNCS_IN('copy_Authenticator', 'asn1')
+ conf.CHECK_FUNCS_IN('roken_getaddrinfo_hostspec', 'roken')
+ conf.CHECK_FUNCS_IN('gss_display_status', 'gssapi gssapi_krb5')
+ conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
+ conf.CHECK_FUNCS('''
+krb5_set_real_time krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
+krb5_set_default_tgs_ktypes krb5_principal2salt krb5_use_enctype
+krb5_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey
+krb5_auth_con_setuseruserkey krb5_locate_kdc krb5_get_permitted_enctypes
+krb5_get_default_in_tkt_etypes krb5_free_data_contents
+krb5_principal_get_comp_string krb5_free_unparsed_name
+krb5_free_keytab_entry_contents krb5_kt_free_entry krb5_krbhst_init
+krb5_krbhst_get_addrinfo krb5_c_enctype_compare krb5_enctypes_compatible_keys
+krb5_crypto_init krb5_crypto_destroy krb5_decode_ap_req free_AP_REQ
+krb5_verify_checksum krb5_c_verify_checksum krb5_principal_compare_any_realm
+krb5_parse_name_norealm krb5_princ_size krb5_get_init_creds_opt_set_pac_request
+krb5_get_renewed_creds krb5_get_kdc_cred krb5_free_error_contents
+initialize_krb5_error_table krb5_get_init_creds_opt_alloc
+krb5_get_init_creds_opt_free krb5_get_init_creds_opt_get_error
+krb5_enctype_to_string krb5_fwd_tgt_creds krb5_auth_con_set_req_cksumtype
+krb5_get_creds_opt_alloc krb5_get_creds_opt_set_impersonate krb5_get_creds
+krb5_get_credentials_for_user krb5_get_host_realm krb5_free_host_realm''',
+ lib='krb5')
+ conf.CHECK_DECLS('''krb5_get_credentials_for_user
+ krb5_auth_con_set_req_cksumtype''',
+ headers='krb5.h', always=True)
+ else:
+ conf.SET_TARGET_TYPE('krb5', 'EMPTY')
+ conf.SET_TARGET_TYPE('gssapi', 'EMPTY')
+ conf.SET_TARGET_TYPE('gssapi_krb5', 'EMPTY')
+
+ # FIXME: these should be tests for features, but the old build system just
+ # checks for OSes.
+ import sys
+ host_os = sys.platform
+
+ # Python doesn't have case switches... :/
+ # FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
+ # the search for .rfind('gnu') covers gnu* and *-gnu is that too broad?
+ if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('qnx') > -1):
+ if host_os.rfind('linux') > -1:
+ conf.DEFINE('LINUX', '1')
+ elif host_os.rfind('qnx') > -1:
+ conf.DEFINE('QNX', '1')
+ conf.DEFINE('STAT_ST_BLOCKSIZE', '512')
+ # FIXME: Add more checks here.
+ else:
+ print "Unknown host_os '%s', please report this to samba-technical at samba.org" % host_os
conf.SAMBA_CONFIG_H('include/config.h')
-#define static_init_idmap { idmap_tdb_init(); idmap_passdb_init(); idmap_nss_init();}
+
+def ctags(ctx):
+ "build 'tags' file using ctags"
+ import Utils
+ source_root = os.path.dirname(Utils.g_module.root_path)
+ cmd = 'ctags $(find %s/.. -name "*.[ch]" | grep -v "*_proto\.h")' % source_root
+ print("Running: %s" % cmd)
+ os.system(cmd)
diff --git a/source3/wscript_build b/source3/wscript_build
index 7b64263..222dab6 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,13 +3,16 @@
from samba_utils import *
TDB_LIB_SRC = '''lib/util_tdb.c ../lib/util/util_tdb.c
- lib/dbwrap.c lib/dbwrap_tdb.c
- lib/dbwrap_ctdb.c
- lib/g_lock.c
- lib/dbwrap_rbt.c'''
+ lib/dbwrap.c lib/dbwrap_tdb.c
+ lib/dbwrap_ctdb.c
+ lib/g_lock.c
+ lib/dbwrap_rbt.c'''
TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
+SMBLDAP = bld.env.SMBLDAP or ""
+SMBLDAPUTIL = bld.env.SMBLDAPUTIL or ""
+
SMBLDAP_SRC = '''${SMBLDAP} ${SMBLDAPUTIL}'''
VERSION_SRC = '''lib/version.c'''
@@ -27,62 +30,58 @@ SERVER_MUTEX_SRC = 'lib/server_mutex.c'
PASSCHANGE_SRC = '''libsmb/passchange.c'''
LIBNDR_DRSUAPI_SRC = '''../librpc/ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_compression.c
- ../librpc/gen_ndr/ndr_drsuapi.c
- ../librpc/ndr/ndr_drsblobs.c
- ../librpc/gen_ndr/ndr_drsblobs.c'''
-
-ZLIB_SRC = '''${ZLIB_SRCS}'''
+ ../librpc/ndr/ndr_compression.c
+ ../librpc/gen_ndr/ndr_drsuapi.c
+ ../librpc/ndr/ndr_drsblobs.c
+ ../librpc/gen_ndr/ndr_drsblobs.c'''
-COMPRESSION_SRC = '''../lib/compression/mszip.c
- ../lib/compression/lzxpress.c
- ${ZLIB_SRC}'''
+COMPRESSION_SRC = '../lib/compression/mszip.c ../lib/compression/lzxpress.c'
DRSUAPI_SRC = '''${LIBNDR_DRSUAPI_SRC}
- ${COMPRESSION_SRC}'''
+ ${COMPRESSION_SRC}'''
LIBNDR_NTLMSSP_SRC = '''../librpc/gen_ndr/ndr_ntlmssp.c
- ../librpc/ndr/ndr_ntlmssp.c'''
+ ../librpc/ndr/ndr_ntlmssp.c'''
LIBNDR_SRC = '''../librpc/ndr/ndr_basic.c
- ../librpc/ndr/ndr.c
- ../librpc/ndr/ndr_misc.c
- ../librpc/gen_ndr/ndr_misc.c
- ../librpc/gen_ndr/ndr_security.c
- ../librpc/ndr/ndr_sec_helper.c
- librpc/ndr/ndr_string.c
- ../librpc/ndr/uuid.c
- librpc/ndr/util.c
- ../librpc/gen_ndr/ndr_dcerpc.c'''
+ ../librpc/ndr/ndr.c
+ ../librpc/ndr/ndr_misc.c
+ ../librpc/gen_ndr/ndr_misc.c
+ ../librpc/gen_ndr/ndr_security.c
+ ../librpc/ndr/ndr_sec_helper.c
+ ../librpc/ndr/ndr_string.c
--
Samba Shared Repository
More information about the samba-cvs
mailing list