From: Tom Yu <tlyu@mit.edu>
Date: Wed, 18 Feb 2009 18:19:18 +0000 (+0000)
Subject: pull up r21895 from trunk
X-Git-Tag: krb5-1.7-beta1~78
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5386718e89b4ff0d0f37f38528b8d6004c18f1fd;p=krb5.git

pull up r21895 from trunk

 ------------------------------------------------------------------------
 r21895 | epeisach | 2009-02-05 14:02:29 -0500 (Thu, 05 Feb 2009) | 7 lines
 Changed paths:
    M /trunk/src/lib/rpc/unit-test/config/unix.exp
    M /trunk/src/lib/rpc/unit-test/rpc_test.0/expire.exp
    M /trunk/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
    M /trunk/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp

 ticket: 6349

 Detect failure to register with rpcbind/portmap due to security
 restrictons and not bomb out in tests.

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

ticket: 6349
version_fixed: 1.7
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-7@22022 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/rpc/unit-test/config/unix.exp b/src/lib/rpc/unit-test/config/unix.exp
index 824d46341..f02116e1d 100644
--- a/src/lib/rpc/unit-test/config/unix.exp
+++ b/src/lib/rpc/unit-test/config/unix.exp
@@ -112,6 +112,10 @@ proc rpc_test_exit {} {
 	global server_started
 	global kill
 
+        if { [info exists server_started] && $server_started == 0 } { 
+	    return 
+	}
+
  	if {[catch {
 		expect {
 			-i $server_id
@@ -143,6 +147,7 @@ proc rpc_test_start { } {
  	verbose "% $SERVER" 1
 	set server_pid [spawn $SERVER $PROT]
 	set server_id $spawn_id
+        set server_started 1
 
 	unset env(KRB5_KTNAME)
 
@@ -150,6 +155,18 @@ proc rpc_test_start { } {
 
 	expect {
 		"running" { }
+	        "Cannot register service" {
+		        send_error "Server cannot register with portmap/rpcbind!!\n"
+		        note "+++"
+		        note "+++ These tests require the ability to register with portmap/rpcbind"
+		        note "+++ Either the server is not running or it does not"
+		        note "+++  allow registration using a loopback connection"
+		        note "+++"
+		        verbose $expect_out(buffer) 1
+		        set server_started 0
+		        unsupported "Server registration"
+		        return
+	        }
 		eof { 
 			send_error "server exited!"
 			verbose $expect_out(buffer) 1
diff --git a/src/lib/rpc/unit-test/rpc_test.0/expire.exp b/src/lib/rpc/unit-test/rpc_test.0/expire.exp
index f5841011f..ab3796554 100644
--- a/src/lib/rpc/unit-test/rpc_test.0/expire.exp
+++ b/src/lib/rpc/unit-test/rpc_test.0/expire.exp
@@ -2,7 +2,7 @@ set timeout 40
 
 load_lib "helpers.exp"
 
-global spawn_id
+global server_started
 
 proc expired {} {
     global spawn_id server_id
@@ -18,7 +18,9 @@ proc expired {} {
 
     flush_server
 }
-expired
+
+#if { [info exists server_pid] && ($server_pid >= 0) } { expired }
+if { $server_started } {expired } 
 
 proc overlap {} {
     global spawn_id
@@ -41,6 +43,6 @@ proc overlap {} {
 
     flush_server
 }
-overlap
+if { $server_started } {overlap} 
 
 
diff --git a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp b/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
index 2b2d20520..73083de1f 100644
--- a/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
+++ b/src/lib/rpc/unit-test/rpc_test.0/fullrun.exp
@@ -4,6 +4,9 @@ load_lib "helpers.exp"
 
 global spawn_id
 global server_id
+global server_started
+
+if { !$server_started } {return} 
 
 # Start the client and do a full run
 start_client "full run" fullrun testuser notathena 8h 1026
diff --git a/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp b/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
index 2bb936ab5..c3e78b1a4 100644
--- a/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
+++ b/src/lib/rpc/unit-test/rpc_test.0/gsserr.exp
@@ -4,8 +4,11 @@ load_lib "helpers.exp"
 
 global spawn_id
 global server_id
+global server_started
 global hostname
 
+if { !$server_started } {return} 
+
 start_client "gss err" gsserr testuser notathena 8h 1026 notserver@$hostname
 
 eof_client "gss err" gsserr $spawn_id 2