[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  ad8b150 s3-build: gss_krb5_export_lucid_sec_context is no longer used in the s3 build
       via  d4cfed3 wintest: test demote of DC
      from  4442c0b lib/tdb: fix transaction issue for HAVE_INCOHERENT_MMAP.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ad8b150b9b3a23c89c5f0542882a8f13e30ece15
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 23 10:32:47 2012 +1100

    s3-build: gss_krb5_export_lucid_sec_context is no longer used in the s3 build
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Fri Mar 23 04:37:36 CET 2012 on sn-devel-104

commit d4cfed3df83ccbcb49e3adf8e25fd92c8007a1a0
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Fri Mar 23 09:40:39 2012 +1100

    wintest: test demote of DC

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in     |    6 ------
 wintest/test-s4-howto.py |    3 +++
 2 files changed, 3 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 51e163d..ffa2b80 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3908,7 +3908,6 @@ if test x"$with_ads_support" != x"no"; then
   AC_CHECK_FUNC_EXT(gss_oid_equal, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(gss_inquire_sec_context_by_oid, $KRB5_LIBS)
   AC_CHECK_FUNC_EXT(gss_wrap_iov, $KRB5_LIBS)
-  AC_CHECK_FUNC_EXT(gss_krb5_export_lucid_sec_context, $KRB5_LIBS)
 
   # This is for FreeBSD (and possibly others). gss_mech_krb5 is a
   # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5
@@ -4488,11 +4487,6 @@ if test x"$with_ads_support" != x"no"; then
     fi
   fi
 
-  if test x"$ac_cv_func_ext_gss_krb5_export_lucid_sec_context" != x"yes" ; then
-    AC_MSG_WARN(need gss_krb5_export_lucid_sec_context for SPNEGO and gss_wrap support)
-    use_ads=no
-  fi
-
   if test x"$use_ads" = x"yes"; then
     AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
     AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 294a94e..36beabb 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -464,6 +464,9 @@ def test_join_as_dc(t, vm):
     t.retry_cmd("bin/smbclient -L ${HOSTNAME}.${WIN_REALM} -Utest3%${PASSWORD3} -k no", ['LOGON_FAILURE'])
     t.retry_cmd("bin/smbclient -L ${WIN_HOSTNAME}.${WIN_REALM} -Utest2%${PASSWORD2} -k yes", ['LOGON_FAILURE'])
     t.retry_cmd("bin/smbclient -L ${HOSTNAME}.${WIN_REALM} -Utest3%${PASSWORD3} -k yes", ['LOGON_FAILURE'])
+
+    t.run_cmd('bin/samba-tool domain demote -Uadministrator@${WIN_REALM}%${WIN_PASS}')
+
     t.vm_poweroff("${WIN_VM}")
 
 


-- 
Samba Shared Repository