[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Fri Oct 7 20:53:02 MDT 2011
The branch, master has been updated
via 078db8f build: build wbinfo only once in the waf build
via 820fe8a build: remove double-setting of build_public_headers
via 50c8d38 build: s3 public headers appear to be correct now
from f0cd3f6 selftest: run dfs tests on plugin_s4_dc
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 078db8f6c9580e215d850d26e8a9942aa757e245
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Oct 8 11:19:35 2011 +1100
build: build wbinfo only once in the waf build
Autobuild-User: Andrew Bartlett <abartlet at samba.org>
Autobuild-Date: Sat Oct 8 04:52:03 CEST 2011 on sn-devel-104
commit 820fe8acca1454b43bc5454f56cf848d6250bc4c
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Oct 8 10:50:32 2011 +1100
build: remove double-setting of build_public_headers
The top level build already sets this, so we do not need to set it twice.
Andrew Bartlett
commit 50c8d3813ce88ae48f7fbf513fa74930c9e661a0
Author: Andrew Bartlett <abartlet at samba.org>
Date: Sat Oct 8 10:49:49 2011 +1100
build: s3 public headers appear to be correct now
The build now passes without this setting, so remove it to ensure we
do this check in future.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wbinfo.c | 3 ++-
nsswitch/wscript_build | 5 +++++
source3/wscript_build | 15 ---------------
source4/winbind/wscript_build | 4 ----
4 files changed, 7 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 6459b8e..e7f902f 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -22,13 +22,14 @@
*/
#include "includes.h"
-#include "popt_common.h"
#include "winbind_client.h"
#include "libwbclient/wbclient.h"
#include "lib/popt/popt.h"
#include "../libcli/auth/libcli_auth.h"
#if (_SAMBA_BUILD_) >= 4
#include "lib/cmdline/popt_common.h"
+#else
+#include "popt_common.h"
#endif
#ifdef DBGC_CLASS
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index 4e353d3..f740fdf 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -40,3 +40,8 @@ bld.SAMBA_SUBSYSTEM('WB_REQTRANS',
source='wb_reqtrans.c',
deps='talloc tevent LIBASYNC_REQ'
)
+
+bld.SAMBA_BINARY('wbinfo',
+ source='wbinfo.c',
+ deps='samba-util LIBCLI_AUTH popt POPT_SAMBA wbclient LIBAFS_SETTOKEN'
+ )
diff --git a/source3/wscript_build b/source3/wscript_build
index 289d9a1..78b2474 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,12 +3,6 @@
from samba_utils import *
import samba_version, samba3
-# enable building of public headers in the build tree
-bld.env.build_public_headers = 'include/public'
-
-# s3 public headers refer to non-public headers
-bld.env.public_headers_allow_broken = True
-
TDB_LIB_SRC = '''
lib/dbwrap/dbwrap_open.c
lib/dbwrap/dbwrap_tdb.c
@@ -612,8 +606,6 @@ SMBFILTER_SRC = '''utils/smbfilter.c'''
WINBIND_WINS_NSS_SRC = '''../nsswitch/wins.c'''
-WBINFO_SRC = '''../nsswitch/wbinfo.c'''
-
NTLM_AUTH_SRC1 = '''utils/ntlm_auth.c utils/ntlm_auth_diagnostics.c'''
NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}'''
@@ -1344,13 +1336,6 @@ bld.SAMBA3_BINARY('versiontest',
deps='SAMBA_VERSION samba3core param',
vars=locals())
-bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
- source=WBINFO_SRC,
- deps='''talloc wbclient tevent cap
- asn1util LIBTSOCKET pdb ldap param smbd_shim
- LIBNTLMSSP popt_samba3 LIBAFS_SETTOKEN''',
- vars=locals())
-
bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
deps='''tdb_compat talloc cap KRB5_WRAP k5crypto wbclient param smbd_shim
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 8bf5d76..5ba9c2a 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -24,7 +24,3 @@ bld.SAMBA_SUBSYSTEM('IDMAP',
public_deps='samdb-common ldbsamba'
)
-bld.SAMBA_BINARY('wbinfo',
- source='../../nsswitch/wbinfo.c',
- deps='samba-util LIBCLI_AUTH popt POPT_SAMBA winbind-client wbclient tevent tevent-util LIBASYNC_REQ security ndr NDR_SECURITY'
- )
--
Samba Shared Repository
More information about the samba-cvs
mailing list