diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-11-21 15:34:43 +1100 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-11-22 10:21:16 +0100 |
| commit | 1000da933534f1148f5b6f9db2029a5074917968 (patch) | |
| tree | 572424881c6c14f0fe065cab7df7a9264536f966 | |
| parent | c704f0daa5e81911ea2b507323b5005303f61e91 (diff) | |
| download | samba-1000da933534f1148f5b6f9db2029a5074917968.tar.gz samba-1000da933534f1148f5b6f9db2029a5074917968.tar.bz2 samba-1000da933534f1148f5b6f9db2029a5074917968.zip | |
build: Use ntlm_auth from source3 as the only ntlm_auth installed on the system
The ntlm_auth4 binary is untested, and is missing major features compared with
the source3 binary. The two are being slowly merged, but I have not finished
that.
Andrew Bartlett
Reviewed-by: Andreas Schneider <asn@samba.org>
| -rw-r--r-- | selftest/wscript | 2 | ||||
| -rwxr-xr-x | source3/wscript_build | 2 | ||||
| -rw-r--r-- | source4/utils/wscript_build | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/selftest/wscript b/selftest/wscript index a5b2e5358f..4733dc17cd 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -121,7 +121,7 @@ def cmd_testonly(opt): 'smbclient3:smbclient,' + 'smbclient4:smbclient4,' + 'smbtorture4:smbtorture,' + - 'ntlm_auth3:ntlm_auth3') + 'ntlm_auth3:ntlm_auth') env.OPTIONS = '--binary-mapping=%s' % binary_mapping if not Options.options.SLOWTEST: diff --git a/source3/wscript_build b/source3/wscript_build index 351d22df7d..d21aa7b842 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1568,7 +1568,7 @@ bld.SAMBA3_BINARY('versiontest', param''', vars=locals()) -bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3, +bld.SAMBA3_BINARY('ntlm_auth', source=NTLM_AUTH_SRC, deps=''' talloc diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index da937dd357..3b21eda900 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -1,11 +1,13 @@ #!/usr/bin/env python -bld.SAMBA_BINARY('ntlm_auth', - source='ntlm_auth.c', - manpages='man/ntlm_auth.1', - deps='''samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE - auth4 NTLMSSP_COMMON MESSAGING events service''', - pyembed=True +bld.SAMBA_BINARY('ntlm_auth4', + source='ntlm_auth.c', + manpages='man/ntlm_auth.1', + deps='''samba-hostconfig samba-util popt + POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE + auth4 NTLMSSP_COMMON MESSAGING events service''', + pyembed=True, + install=False ) |