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>

diff --git a/selftest/wscript b/selftest/wscript
index a5b2e5358f6460380dfdc3c2c6b60225c439363e..4733dc17cd1d4ddd257b4cdcbe914e8baa4365b7 100644 (file)
--- 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 351d22df7d161945d94a4d2e06887155fb554855..d21aa7b842727dc8994b1f6c78745c979c4727ab 100755 (executable)
--- 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 da937dd3574c51eed32dae9dbc85c2e7db3708ec..3b21eda9009e56e7866b06a25b1f97b66bdbdf77 100644 (file)
--- 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
        )