[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  5c12cb0 heimdal Pass F_CANON down to the hdb layer for servers in AS-REP as well
       via  0dec840 Add support for testing a Win2k3 domain member
       via  5425227 wintest upper case the --vms paramter arguments to wintest.py
      from  78c4b21 s3-selftest: make sure we really use --format=subunit when calling smbtorture4.

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


- Log -----------------------------------------------------------------
commit 5c12cb0556aeeaa8882c7b12a281728bf8d556f6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 17 11:52:46 2011 +1100

    heimdal Pass F_CANON down to the hdb layer for servers in AS-REP as well
    
    This fixes Win2003 domain logons against Samba4, which need a
    canonicalised reply, and helpfully do set that flag.
    
    Specifically, they need that realm in krbtgt/realm at realm that these
    both match exactly in the reply.
    
    Andrew Bartlett
    
    Autobuild-User: Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date: Thu Feb 17 06:40:53 CET 2011 on sn-devel-104

commit 0dec840677779a3d86137bb307f57b35f7392d51
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 17 11:21:41 2011 +1100

    Add support for testing a Win2k3 domain member

commit 5425227b55820b3d6999870f8ffa690411611961
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Feb 17 11:21:12 2011 +1100

    wintest upper case the --vms paramter arguments to wintest.py
    
    This makes it easier to specify

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

Summary of changes:
 source4/heimdal/kdc/kerberos5.c |    3 +--
 wintest/conf/abartlet.conf      |   15 ++++++++++++---
 wintest/test-s4-howto.py        |    7 +++++++
 wintest/wintest.py              |    5 ++++-
 4 files changed, 24 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/heimdal/kdc/kerberos5.c b/source4/heimdal/kdc/kerberos5.c
index 394f4de..a437b9d 100644
--- a/source4/heimdal/kdc/kerberos5.c
+++ b/source4/heimdal/kdc/kerberos5.c
@@ -1000,9 +1000,8 @@ _kdc_as_rep(krb5_context context,
 	ret = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN;
 	goto out;
     }
-
     ret = _kdc_db_fetch(context, config, server_princ,
-			HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
+			HDB_F_GET_SERVER|HDB_F_GET_KRBTGT | flags,
 			NULL, NULL, &server);
     if(ret == HDB_ERR_NOT_FOUND_HERE) {
 	kdc_log(context, config, 5, "target %s does not have secrets at this KDC, need to proxy", server_name);
diff --git a/wintest/conf/abartlet.conf b/wintest/conf/abartlet.conf
index af3c5b7..aa07a75 100644
--- a/wintest/conf/abartlet.conf
+++ b/wintest/conf/abartlet.conf
@@ -78,12 +78,21 @@ W2K3A_VM              : Win2003R2-2
 W2K3A_REALM           : 2003.HOWTO.ABARTLET.NET
 W2K3A_DOMAIN          : 2003HOWTO
 W2K3A_PASS            : penguin
-W2K3A_SNAPSHOT        : 1291097054
-W2K3A_IP              : 192.168.122.155
+W2K3A_SNAPSHOT        : 1297901741
+W2K3A_IP              : 192.168.122.91
 
 # this w2k3 VM will become a DC in the samba domain
 W2K3B_HOSTNAME        : Win2003R2-1
 W2K3B_VM              : Win2003R2-1
 W2K3B_PASS            : penguin
-W2K3B_SNAPSHOT        : 1290386298
+W2K3B_SNAPSHOT        : 1297901376
+W2K3B_IP              : 192.168.122.155
+
+# this w2k3 VM will become a member in the samba domain
+W2K3C_HOSTNAME        : Win2003-1
+W2K3C_VM              : Win2003-1
+W2K3C_PASS            : penguin
+W2K3C_SNAPSHOT        : 1297900649
+W2K3C_IP              : 192.168.122.38
+
 
diff --git a/wintest/test-s4-howto.py b/wintest/test-s4-howto.py
index 9a848de..73c8a8b 100755
--- a/wintest/test-s4-howto.py
+++ b/wintest/test-s4-howto.py
@@ -592,6 +592,13 @@ def test_howto(t):
         t.test_remote_smbclient("WINXP", "administrator", "${PASSWORD1}")
         t.vm_poweroff("${WIN_VM}")
 
+    if t.have_vm('W2K3C') and not t.skip("win2k3_member"):
+        t.start_winvm("W2K3C")
+        run_winjoin(t, "W2K3C")
+        test_winjoin(t, "W2K3C")
+        t.test_remote_smbclient("W2K3C", "administrator", "${PASSWORD1}")
+        t.vm_poweroff("${WIN_VM}")
+
     if t.have_vm('W2K8R2C') and not t.skip("dcpromo_rodc"):
         t.info("Testing w2k8r2 RODC dcpromo")
         t.start_winvm("W2K8R2C")
diff --git a/wintest/wintest.py b/wintest/wintest.py
index 2939b0f..189d251 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -90,7 +90,10 @@ class wintest():
     def set_vms(self, vms):
         '''set a list of VMs to test'''
         if vms is not None:
-            self.vms = vms.split(',')
+            self.vms = []
+            for vm in vms.split(','):
+                vm = vm.upper()
+                self.vms.append(vm)
 
     def skip(self, step):
         '''return True if we should skip a step'''


-- 
Samba Shared Repository