wintest: connect to correct hostname in test_net_use

diff --git a/wintest/test-s3.py b/wintest/test-s3.py
index 811e086dc18a465026bab5f8c431bd5e3e18813c..1b9a26d4803c31a26064ac1730f1f6d65543466b 100755 (executable)
--- a/wintest/test-s3.py
+++ b/wintest/test-s3.py
@@ -232,7 +232,7 @@ def test_s3(t):
         t.test_remote_smbclient('WINDOWS7', dom_username, dom_password, args='--option=clientntlmv2auth=no')
         t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
         t.test_remote_smbclient('WINDOWS7', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --option=clientusespnegoprincipal=yes")
-        t.test_net_use('WINDOWS7', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+        t.test_net_use('WINDOWS7', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
 
     if t.have_var('WINXP_VM') and t.have_var('W2K8R2A_VM') and not t.skip("join_winxp_2008r2"):
         if not dc_started:
@@ -251,7 +251,7 @@ def test_s3(t):
         t.test_remote_smbclient('WINXP', dom_username, dom_password, args='--option=clientntlmv2auth=no')
         t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k")
         t.test_remote_smbclient('WINXP', "%s@%s" % (dom_username, dom_realm), dom_password, args="-k --clientusespnegoprincipal=yes")
-        t.test_net_use('WINXP', t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
+        t.test_net_use('WINXP', dom_realm, t.getvar("W2K8R2A_DOMAIN"), 'root', '${PASSWORD2}')
 
     t.info("S3 test: All OK")
 

diff --git a/wintest/wintest.py b/wintest/wintest.py
index d5728a883b5a7a9d2548b21175cacfdeeea510a4..325da964e22b9e5de5e4fec6b8db2e644358b2b9 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -845,11 +845,11 @@ RebootOnCompletion=No
         self.cmd_contains("bin/smbclient --version", ["${SAMBA_VERSION}"])
         self.retry_cmd('bin/smbclient -L ${WIN_HOSTNAME} -U%s%%%s %s' % (username, password, args), ["IPC"])
 
-    def test_net_use(self, vm, domain, username, password):
+    def test_net_use(self, vm, realm, domain, username, password):
         self.setwinvars(vm)
         self.info('Testing net use against Samba3 member')
         child = self.open_telnet("${WIN_HOSTNAME}", "%s\\%s" % (domain, username), password)
-        child.sendline("net use t: \\\\${HOSTNAME}.${LCREALM}\\test")
+        child.sendline("net use t: \\\\${HOSTNAME}.%s\\test" % realm)
         child.expect("The command completed successfully")