[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  d957fd5 selftest: Test both users created in plugin_s4_dc environment
       via  a2caad2 selftest: don't override just-added username in plugin_s4_dc test
      from  05d00ed nsswitch: Fix build check logic

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


- Log -----------------------------------------------------------------
commit d957fd5ae7c98fdfdc322b6aff1a7a8df09f7045
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon May 9 04:22:01 2011 +0200

    selftest: Test both users created in plugin_s4_dc environment
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Mon May  9 06:10:52 CEST 2011 on sn-devel-104

commit a2caad24a12f3cfb8b122ed0e2cf22e612d38e35
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon May 9 04:20:00 2011 +0200

    selftest: don't override just-added username in plugin_s4_dc test
    
    This will allow us to test a user added via smbpasswd as well as the
    administrator added by provision.
    
    Andrew Bartlett

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

Summary of changes:
 selftest/target/Samba3.pm |    2 --
 source4/selftest/tests.py |    1 +
 2 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index e99498b..2f65be4 100644
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -300,8 +300,6 @@ sub setup_plugin_s4_dc($$$$)
 	$ret->{DOMAIN} = $dcvars->{DOMAIN};
 	$ret->{REALM} = $dcvars->{REALM};
 	$ret->{KRB5_CONFIG} = $dcvars->{KRB5_CONFIG};
-	$ret->{DC_USERNAME} = $dcvars->{USERNAME};
-	$ret->{DC_PASSWORD} = $dcvars->{PASSWORD};
 
 	# We need world access to this share, as otherwise the domain
 	# administrator from the AD domain provided by Samba4 can't
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index dfeb9ef..fab62d6 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -320,6 +320,7 @@ for mech in [
     name = "smb.signing on with %s" % signoptions
     plantestsuite_loadlist("samba4.%s local-creds" % name, "s4member", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$NETBIOSNAME/$USERNAME%$PASSWORD', 'base.xcopy'])
     plantestsuite_loadlist("samba4.%s" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$USERNAME%$PASSWORD', 'base.xcopy'])
+    plantestsuite_loadlist("samba4.%s administrator" % name, "plugin_s4_dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', signoptions, '-U$DC_USERNAME%$DC_PASSWORD', 'base.xcopy'])
 plantestsuite_loadlist("samba4.smb.signing --signing=yes anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=yes', '-U%', 'base.xcopy'])
 plantestsuite_loadlist("samba4.smb.signing --signing=required anon", "dc", [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=required', '-U%', 'base.xcopy'])
 plantestsuite_loadlist("samba4.smb.signing --signing=no anon", "s4member",  [valgrindify(smb4torture), "$LISTOPT", '//$NETBIOSNAME/tmp', '-k', 'no', '--signing=no', '-U%', 'base.xcopy'])


-- 
Samba Shared Repository