The branch, master has been updated via 0502486 land-remote: Fix --fail-slowly. via 9d2e777 ldb: Build ildap module as shared object. via 484939d samdb_common, ntlm: Add missing dependency on libsamba-hostconfig. via 837bcb9 popt_credentials: Implement pending machine account manually, rather than through credentials. from df7523c pidl: fix minor typo in s3 server generation.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 05024867d31311a2eae3f94eea45bb09befa982c Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 11 15:42:14 2010 +0200 land-remote: Fix --fail-slowly. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Mon Oct 11 15:54:31 UTC 2010 on sn-devel-104 commit 9d2e777e18fda6489c20c96f4c09fc41f92d7727 Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 11 15:09:23 2010 +0200 ldb: Build ildap module as shared object. commit 484939db0fb789c43181cf1df6a6f66753fd067e Author: Jelmer Vernooij <jel...@samba.org> Date: Mon Oct 11 14:31:58 2010 +0200 samdb_common, ntlm: Add missing dependency on libsamba-hostconfig. commit 837bcb9e0fe50acb11c4051fbd9b2d32abc8680e Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 10 19:17:40 2010 +0200 popt_credentials: Implement pending machine account manually, rather than through credentials. ----------------------------------------------------------------------- Summary of changes: script/land-remote.py | 2 ++ source4/auth/ntlm/wscript_build | 2 +- source4/dsdb/wscript_build | 2 +- source4/lib/cmdline/popt_credentials.c | 15 ++++++++++----- source4/lib/ldb/wscript | 10 +++------- 5 files changed, 17 insertions(+), 14 deletions(-) Changeset truncated at 500 lines: diff --git a/script/land-remote.py b/script/land-remote.py index 93178b5..1009e6b 100755 --- a/script/land-remote.py +++ b/script/land-remote.py @@ -104,6 +104,8 @@ if opts.pushto: remote_args.append("--pushto=%s" % opts.pushto) if opts.push_master: remote_args.append("--push-master") +if opts.fail_slowly: + remote_args.append("--fail-slowly") remote_args += extra_args print "%s$ %s" % (opts.host, " ".join(remote_args)) diff --git a/source4/auth/ntlm/wscript_build b/source4/auth/ntlm/wscript_build index 936e6f5..ab17237 100644 --- a/source4/auth/ntlm/wscript_build +++ b/source4/auth/ntlm/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('auth_sam_module', source='auth_sam.c', subsystem='auth', init_function='auth_sam_init', - deps='SAMDB auth_sam ntlm_check' + deps='SAMDB auth_sam ntlm_check LIBSAMBA-HOSTCONFIG' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 15ca7f9..7010698 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB', bld.SAMBA_SUBSYSTEM('SAMDB_COMMON', source='common/util.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c', autoproto='common/proto.h', - deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH LIBTSOCKET samba_socket' + deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH LIBTSOCKET samba_socket LIBSAMBA-HOSTCONFIG' ) diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 1776fb2..11f4036 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -31,13 +31,13 @@ * -k,--use-kerberos * -N,--no-pass * -S,--signing - * -P --machine-pass - * --simple-bind-dn - * --password + * -P,--machine-pass + * --simple-bind-dn + * --password */ - static bool dont_ask; +static bool machine_account_pending; enum opt { OPT_SIMPLE_BIND_DN, OPT_PASSWORD, OPT_KERBEROS, OPT_SIGN, OPT_ENCRYPT }; @@ -65,6 +65,11 @@ static void popt_common_credentials_callback(poptContext con, if (!dont_ask) { cli_credentials_set_cmdline_callbacks(cmdline_credentials); } + + if (machine_account_pending) { + cli_credentials_set_machine_account(cmdline_credentials, cmdline_lp_ctx); + } + return; } @@ -97,7 +102,7 @@ static void popt_common_credentials_callback(poptContext con, case 'P': /* Later, after this is all over, get the machine account details from the secrets.ldb */ - cli_credentials_set_machine_account_pending(cmdline_credentials, cmdline_lp_ctx); + machine_account_pending = true; break; case OPT_KERBEROS: diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 67b25b4..9246fbe 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -77,21 +77,20 @@ def build(bld): ldb_attributes.c attrib_handlers.c ldb_controls.c qsort.c''') if s4_build: - builtin_ildap = not bld.CONFIG_SET('USING_SYSTEM_LDB') # this is only in the s4 build bld.SAMBA_MODULE('ldb_ildap', 'ldb_ildap/ldb_ildap.c', init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)', deps='talloc LIBCLI_LDAP CREDENTIALS auth_system_session', aliases='ldb_ldaps ldb_ldapi ldb_ldap', - internal_module=builtin_ildap, + internal_module=False, subsystem='ldb') else: - builtin_ildap = False # this is not included in the s4 build bld.SAMBA_MODULE('ldb_ldap', 'ldb_ldap/ldb_ldap.c', init_function='LDB_BACKEND(ldapi),LDB_BACKEND(ldaps),LDB_BACKEND(ldap)', deps='talloc lber ldap', enabled=bld.env.ENABLE_LDAP_BACKEND, + internal_module=False, subsystem='ldb') # we're not currently linking against the ldap libs, but ldb.pc.in @@ -102,10 +101,7 @@ def build(bld): bld.env.PACKAGE_VERSION = VERSION bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - if builtin_ildap: - abi_file = 'ABI/ldb-ildap-%s.sigs' % VERSION - else: - abi_file = 'ABI/ldb-%s.sigs' % VERSION + abi_file = 'ABI/ldb-%s.sigs' % VERSION bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb', source='pyldb_util.c', pyext=True) -- Samba Shared Repository