[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  2ce68d9 Make samba4.drs.fsmo.python knownfail
       via  e28df27 s3: Fix the build on FreeBSD 8
      from  3c9b3b2 Add the same fix to the S3 event backend as the previous commit added to the tevent poll backend.

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


- Log -----------------------------------------------------------------
commit 2ce68d93f3eb38e6122dddc8bcd30795c48d07b7
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 4 14:10:46 2011 +0200

    Make samba4.drs.fsmo.python knownfail
    
    This frequently blocks autobuild for me, this time with
    
    Testing for rid role transfer from localdc.samba.example.com to localvampiredc.samba.example.com
    ERROR: Failed to initiate transfer of 'rid' role: LDAP error 52 LDAP_UNAVAILABLE -  <Failed FSMO transfer: NT_STATUS_IO_TIMEOUT> <>
    UNEXPECTED(failure): samba4.drs.fsmo.python(vampire_dc).fsmo.DrsFsmoTestCase.test_RIDMasterTransfer
    REASON: _StringException: _StringException: Content-Type: text/x-traceback;charset=utf8,language=python
    traceback
    36E
    Traceback (most recent call last):
      File "/usr/lib/python2.6/dist-packages/testtools/runtest.py", line 128, in _run_user
        return fn(*args)
      File "/usr/lib/python2.6/dist-packages/testtools/testcase.py", line 368, in _run_test_method
        testMethod()
      File "/memdisk/vlendec/a/b5798/samba4/source4/torture/drs/python/fsmo.py", line 125, in test_RIDMasterTransfer
        self._role_transfer(role="rid", role_dn=self.rid_dn)
      File "/memdisk/vlendec/a/b5798/samba4/source4/torture/drs/python/fsmo.py", line 97, in _role_transfer
        self._net_fsmo_role_transfer(DC=self.dnsname_dc2, role=role)
      File "/memdisk/vlendec/a/b5798/samba4/source4/torture/drs/python/fsmo.py", line 68, in _net_fsmo_role_transfer
        self.assertEquals(ret, 0, "Transferring role %s to %s has failed!" % (role, DC))
    AssertionError: Transferring role rid to localvampiredc.samba.example.com has failed!
    0
    
    NT_STATUS_IO_TIMEOUT -- does that mean that sn.samba.org is not powerful enough
    to run this test successfully?
    
    Volker
    
    Autobuild-User: Volker Lendecke <vlendec at samba.org>
    Autobuild-Date: Sat Jun  4 15:24:20 CEST 2011 on sn-devel-104

commit e28df27f2a6744e20e6413cee0f48c66c920e080
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Jun 4 14:18:31 2011 +0200

    s3: Fix the build on FreeBSD 8
    
    This is probably not the last word on gss_mech_krb5, but for now it fixes
    the build on FreeBSD

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

Summary of changes:
 source3/configure.in       |    5 +++++
 source4/selftest/knownfail |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 12d083b..324ada4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3917,6 +3917,11 @@ 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)
 
+  # This is for FreeBSD (and possibly others). gss_mech_krb5 is a
+  # #define to GSS_KRB5_MECHANISM, which is defined in -lgssapi_krb5
+  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS, GSS_KRB5_MECHANISM,
+  		   [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5"])
+
   # MIT krb5 1.8 does not expose this call (yet)
   AC_CHECK_DECLS(krb5_get_credentials_for_user, [], [], [#include <krb5.h>])
 
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index d0d3ace..af807fc 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -85,3 +85,4 @@
 ^samba4.nbt.winsreplication.owned # fails sometimes, timing related
 ^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.test_dirsync_deleted_items
 #^samba4.ldap.dirsync.python.dc..__main__.ExtendedDirsyncTests.*
+^samba4.drs.fsmo.python


-- 
Samba Shared Repository