svn commit: samba r22187 - in branches/SAMBA_4_0: source/auth/credentials source/script/tests testprogs/blackbox

[abartlet at samba.org]

Author: abartlet
Date: 2007-04-12 10:25:01 +0000 (Thu, 12 Apr 2007)
New Revision: 22187

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22187

Log:
Test kerberos logins in the smbclient blackbox tests, including with a
machine account.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
   branches/SAMBA_4_0/source/script/tests/mktestdc.sh
   branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
   branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh


Changeset:
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c	2007-04-12 10:19:02 UTC (rev 22186)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_krb5.c	2007-04-12 10:25:01 UTC (rev 22187)
@@ -248,6 +248,10 @@
 {
 	krb5_error_code ret;
 	
+	if (cred->machine_account_pending) {
+		cli_credentials_set_machine_account(cred);
+	}
+
 	if (cred->ccache_obtained >= (MAX(cred->principal_obtained, 
 					  cred->username_obtained))) {
 		*ccc = cred->ccache;

Modified: branches/SAMBA_4_0/source/script/tests/mktestdc.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/mktestdc.sh	2007-04-12 10:19:02 UTC (rev 22186)
+++ branches/SAMBA_4_0/source/script/tests/mktestdc.sh	2007-04-12 10:25:01 UTC (rev 22187)
@@ -210,6 +210,11 @@
   admin_server = 127.0.0.1:88
   default_domain = $DNSNAME
  }
+ $DNSNAME = {
+  kdc = 127.0.0.1:88
+  admin_server = 127.0.0.1:88
+  default_domain = $DNSNAME
+ }
  $DOMAIN = {
   kdc = 127.0.0.1:88
   admin_server = 127.0.0.1:88

Modified: branches/SAMBA_4_0/source/script/tests/test_blackbox.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_blackbox.sh	2007-04-12 10:19:02 UTC (rev 22186)
+++ branches/SAMBA_4_0/source/script/tests/test_blackbox.sh	2007-04-12 10:25:01 UTC (rev 22187)
@@ -16,5 +16,5 @@
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
-plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"
+plantest "blackbox.smbclient" dc $incdir/../../../testprogs/blackbox/test_smbclient.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX" "$ADDARGS"
+plantest "blackbox.cifsdd" dc $incdir/../../../testprogs/blackbox/test_cifsdd.sh "\$NETBIOSNAME" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$ADDARGS"

Modified: branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh
===================================================================
--- branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh	2007-04-12 10:19:02 UTC (rev 22186)
+++ branches/SAMBA_4_0/testprogs/blackbox/test_smbclient.sh	2007-04-12 10:25:01 UTC (rev 22187)
@@ -96,8 +96,10 @@
 echo ls | runcmd "List directory with LANMAN1" -m LANMAN1 || failed=`expr $failed + 1`
 echo ls | runcmd "List directory with LANMAN2" -m LANMAN2 || failed=`expr $failed + 1`
 
-echo ls | testit "Test login with --machine-pass" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --machine-pass  || failed=`expr $failed + 1`
+echo ls | testit "Test login with --machine-pass without kerberos" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --machine-pass -k no || failed=`expr $failed + 1`
 
+echo ls | testit "Test login with --machine-pass and kerberos" $VALGRIND bin/smbclient $CONFIGURATION //$SERVER/tmp --machine-pass -k yes || failed=`expr $failed + 1`
+
 (
     echo "password=$PASSWORD"
     echo "username=$USERNAME"