The branch, master has been updated via 180b3a3 build: Do not build with utmp when we do not have utmp.h via 04593da build: param must require cups to get the cups headers path in -I via 49bb7f2 s3-krb5: Remove GSS_WRAP_IOV conditional via 9e22b09 wintest: test wbinfo --krb5auth via 8b10d68 selftest: test wbinfo --authenticate and --krb5auth via 3a23c66 build: Ensure that we clean build objects from auth/ as well from 7e7aa33 selftest/flapping: mark ^samba3.rpc.spoolss.*printserver.enum_printers_servername as flakey
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 180b3a3bbe922f9d84df4d557be7422d94668b53 Author: Andrew Bartlett <abart...@samba.org> Date: Wed Mar 14 22:37:33 2012 +1100 build: Do not build with utmp when we do not have utmp.h This matches the autoconf build, and should partially address bug #8709. Andrew Bartlett Autobuild-User: Andrew Bartlett <abart...@samba.org> Autobuild-Date: Thu Mar 15 01:12:15 CET 2012 on sn-devel-104 commit 04593da3016482afa21f3a8873a47e9adbf183bb Author: Andrew Bartlett <abart...@samba.org> Date: Wed Mar 14 22:28:38 2012 +1100 build: param must require cups to get the cups headers path in -I commit 49bb7f248a2059dc15636db0d4c00653eab7197c Author: Andrew Bartlett <abart...@samba.org> Date: Sun Mar 11 06:44:17 2012 +1100 s3-krb5: Remove GSS_WRAP_IOV conditional We already confirm that we have this functionality before we set HAVE_KRB5 at configure time. Andrew Bartlett commit 9e22b096ccded46c5b35b7315ea671bde0407437 Author: Andrew Bartlett <abart...@samba.org> Date: Mon Mar 12 18:23:01 2012 +1100 wintest: test wbinfo --krb5auth This will ensure that this functionality is tested with MIT krb5, as the make test system only reaches this code with Heimdal. Andrew Bartlett commit 8b10d6848f49f709a3a281857b46e2b9468b0ff6 Author: Andrew Bartlett <abart...@samba.org> Date: Sun Mar 11 13:00:01 2012 +1100 selftest: test wbinfo --authenticate and --krb5auth commit 3a23c66357afef0743692273b86da0a2d7704454 Author: Andrew Bartlett <abart...@samba.org> Date: Sun Mar 11 09:08:36 2012 +1100 build: Ensure that we clean build objects from auth/ as well ----------------------------------------------------------------------- Summary of changes: source3/Makefile.in | 2 +- source3/auth/auth_generic.c | 2 +- source3/librpc/crypto/gse.c | 4 ++-- source3/libsmb/auth_generic.c | 2 +- source3/selftest/tests.py | 5 +++++ source3/utils/ntlm_auth.c | 2 +- source3/wscript | 5 ++++- source3/wscript_build | 2 +- wintest/test-s3.py | 3 +++ 9 files changed, 19 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/Makefile.in b/source3/Makefile.in index acd47b7..14a67a5 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -3398,7 +3398,7 @@ cleanlibs:: ../libcli/*.o ../libcli/*/*.o ../libcli/*/*/*.o \ ../librpc/*/*.o \ ../libgpo/*.o ../libgpo/*/*.o \ - ../libds/*.o ../libds/*/*.o ../dynconfig/*.o + ../libds/*.o ../libds/*/*.o ../dynconfig/*.o ../auth/*.o ../auth/*/*.o clean:: cleanlibs -rm -f include/build_env.h diff --git a/source3/auth/auth_generic.c b/source3/auth/auth_generic.c index 43baab5..f99d390 100644 --- a/source3/auth/auth_generic.c +++ b/source3/auth/auth_generic.c @@ -294,7 +294,7 @@ NTSTATUS auth_generic_prepare(TALLOC_CTX *mem_ctx, gensec_settings->backends[idx++] = gensec_security_by_oid(NULL, GENSEC_OID_NTLMSSP); -#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV) +#if defined(HAVE_KRB5) gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops; #endif diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c index 9c18443..3571dfd 100644 --- a/source3/librpc/crypto/gse.c +++ b/source3/librpc/crypto/gse.c @@ -30,7 +30,7 @@ #include "../librpc/gen_ndr/dcerpc.h" #include "lib/util/asn1.h" -#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV) +#if defined(HAVE_KRB5) #include "smb_krb5.h" #include "gse_krb5.h" @@ -1180,4 +1180,4 @@ const struct gensec_security_ops gensec_gse_krb5_security_ops = { .priority = GENSEC_GSSAPI }; -#endif /* HAVE_KRB5 && HAVE_GSS_WRAP_IOV */ +#endif /* HAVE_KRB5 */ diff --git a/source3/libsmb/auth_generic.c b/source3/libsmb/auth_generic.c index d38c11c..dbd87ff 100644 --- a/source3/libsmb/auth_generic.c +++ b/source3/libsmb/auth_generic.c @@ -85,7 +85,7 @@ NTSTATUS auth_generic_client_prepare(TALLOC_CTX *mem_ctx, struct auth_generic_st gensec_settings->backends[idx++] = &gensec_ntlmssp3_client_ops; -#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV) +#if defined(HAVE_KRB5) gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops; #endif diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index ad3e67b..8bd16e0 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -124,6 +124,7 @@ tests=["--ping", "--separator", "--name-to-sid=$DOMAIN\\\\$DC_USERNAME", #Didn't pass yet# "--user-info=$USERNAME", "--user-groups=$DOMAIN\\\\$DC_USERNAME", + "--authenticate=$DOMAIN\\\\$DC_USERNAME%$DC_PASSWORD", "--allocate-uid", "--allocate-gid"] @@ -148,6 +149,10 @@ for env in ["s3dc", "member", "s3member"]: plantestsuite("samba3.ntlm_auth.(%s:local)" % env, "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_s3.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', configuration]) +env = "s3member" +t = "--krb5auth=$DOMAIN\\\\$DC_USERNAME%$DC_PASSWORD" +plantestsuite("samba3.wbinfo_s3.(%s:local).%s" % (env, t), "%s:local" % env, [os.path.join(samba3srcdir, "script/tests/test_wbinfo_s3.sh"), t]) + plantestsuite("samba3.ntlm_auth.krb5(ktest:local) old ccache", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-2', '$SERVER', configuration]) plantestsuite("samba3.ntlm_auth.krb5(ktest:local)", "ktest:local", [os.path.join(samba3srcdir, "script/tests/test_ntlm_auth_krb5.sh"), valgrindify(python), samba3srcdir, binpath('ntlm_auth3'), '$PREFIX/ktest/krb5_ccache-3', '$SERVER', configuration]) diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 2216816..6fc772e 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -912,7 +912,7 @@ static NTSTATUS ntlm_auth_start_ntlmssp_server(TALLOC_CTX *mem_ctx, gensec_settings->backends[idx++] = gensec_security_by_oid(NULL, GENSEC_OID_NTLMSSP); -#if defined(HAVE_KRB5) && defined(HAVE_GSS_WRAP_IOV) +#if defined(HAVE_KRB5) gensec_settings->backends[idx++] = &gensec_gse_krb5_security_ops; #endif diff --git a/source3/wscript b/source3/wscript index 829a7e3..4da8a44 100644 --- a/source3/wscript +++ b/source3/wscript @@ -825,6 +825,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); conf.undefine('HAVE_GSSAPI_GSSAPI_H') if Options.options.with_utmp: + conf.env.with_utmp = True + if not conf.CHECK_HEADERS('utmp.h'): conf.env.with_utmp = False conf.CHECK_FUNCS('pututline pututxline updwtmp updwtmpx getutmpx getutxent') conf.CHECK_STRUCTURE_MEMBER('struct utmp', 'ut_name', headers='utmp.h', define='HAVE_UT_UT_NAME') @@ -853,7 +855,8 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); conf.CHECK_CODE('struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);', 'PUTUTLINE_RETURNS_UTMP', headers='utmp.h', msg="Checking whether pututline returns pointer") - conf.DEFINE('WITH_UTMP', 1) + if conf.env.with_utmp: + conf.DEFINE('WITH_UTMP', 1) if Options.options.with_avahi: conf.env.with_avahi = True diff --git a/source3/wscript_build b/source3/wscript_build index 61093a4..e535cf8 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -754,7 +754,7 @@ bld.SAMBA_GENERATOR('param/param_global_h', bld.SAMBA3_SUBSYSTEM('param', source=PARAM_WITHOUT_REG_SRC, - deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h''') + deps='samba-util PARAM_UTIL ldap lber LOADPARM_CTX samba3core smbconf param_local_h param/param_global_h cups''') bld.SAMBA3_PYTHON('pys3param', source='param/pyparam.c', diff --git a/wintest/test-s3.py b/wintest/test-s3.py index 1e32e49..9539122 100755 --- a/wintest/test-s3.py +++ b/wintest/test-s3.py @@ -70,6 +70,9 @@ def test_wbinfo(t): ["plaintext password authentication succeeded", "challenge/response password authentication succeeded"]) + t.retry_cmd("bin/wbinfo --krb5auth=${WIN_DOMAIN}/administrator%${WIN_PASS}", + ["succeeded"]) + def test_smbclient(t): t.info('Testing smbclient') -- Samba Shared Repository