[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  df4752e s4-selftest Remove knownfail for tokengroups test
       via  244c191 s4-dsdb Don't use None as the input to the GENSEC loop in tokengroups test
      from  4744da8 s3-param: Fixed code block in max_open_files().

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


- Log -----------------------------------------------------------------
commit df4752e3ab358d7f8312cec9caaaedf4f6e825a6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 20 08:28:04 2011 +1100

    s4-selftest Remove knownfail for tokengroups test
    
    The problem with this test (use of None rather than "" has been fixed)
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Wed Jan 19 23:56:31 CET 2011 on sn-devel-104

commit 244c191f9e1f6a27ec52261a31f7130106bb0310
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Jan 20 07:20:06 2011 +1100

    s4-dsdb Don't use None as the input to the GENSEC loop in tokengroups test
    
    The input to gensec.update() should always be a string.
    
    Andrew Bartlett

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

Summary of changes:
 source4/dsdb/tests/python/token_group.py |    2 +-
 source4/selftest/knownfail               |    1 -
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/dsdb/tests/python/token_group.py b/source4/dsdb/tests/python/token_group.py
index a35f183..e3ffbac 100755
--- a/source4/dsdb/tests/python/token_group.py
+++ b/source4/dsdb/tests/python/token_group.py
@@ -133,7 +133,7 @@ class TokenTest(samba.tests.TestCase):
 
         client_finished = False
         server_finished = False
-        server_to_client = None
+        server_to_client = ""
         
         """Run the actual call loop"""
         while client_finished == False and server_finished == False:
diff --git a/source4/selftest/knownfail b/source4/selftest/knownfail
index c10730b..7e11f22 100644
--- a/source4/selftest/knownfail
+++ b/source4/selftest/knownfail
@@ -79,4 +79,3 @@ samba4.smb2.compound.*.related2
 samba4.smb2.compound.*.invalid2
 samba4.ldap.acl.*.search.* # ACL search behaviour not enabled by default
 samba4.ldap.acl.*.ntSecurityDescriptor.* # ACL extended checks on search not enabled by default
-samba4.tokengroups.python # randomly fails


-- 
Samba Shared Repository