Remove kadmind4 and v5passwdd

Per email to kerberos-announce remove kadmind4 and v5passwdd from the distribution.

Ticket: new
Tags: enhancement

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15880 dc483132-0cff-0310-8789-dd5450dbe970

11 files changed, 0 insertions, 633 deletions

diff --git a/src/kadmin/v4server/unit-test/ChangeLog b/src/kadmin/v4server/unit-test/ChangeLog
deleted file mode 100644
index 326a077fe..000000000
--- a/src/kadmin/v4server/unit-test/ChangeLog
+++ /dev/null
@@ -1,97 +0,0 @@
-2003-01-07  Ken Raeburn  <raeburn@mit.edu>
-
-	* Makefile.ov: Deleted.
-
-2002-08-29  Ken Raeburn  <raeburn@mit.edu>
-
-	* Makefile.in: Revert $(S)=>/ change, for Windows support.
-
-2002-08-23  Ken Raeburn  <raeburn@mit.edu>
-
-	* Makefile.in: Change $(S)=>/ and $(U)=>.. globally.
-
-1999-08-31  Ken Raeburn  <raeburn@mit.edu>
-
-	* lib/helpers.exp (unexpire): Move expiration date ahead a few
-	decades.
-
-	* Makefile.in (check- check-ok): Disable tests until the tests get
-	updated for non-OVSEC mode, etc.
-
-1998-11-13  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* Makefile.in: Set the myfulldir and mydir variables (which are
-		relative to buildtop and thisconfigdir, respectively.)
-
-Tue Mar  3 10:30:11 1998  Ezra Peisach  <epeisach@kangaroo.mit.edu>
-
-	* Makefile.in (check): Use the variable DO_V4_TEST to distinguish
-        from the other kadmin testing.
-
-Fri Feb 27 23:32:38 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* Makefile.in: Changed thisconfigdir to point at the kadmin
- 		directory, since we've moved all of the configure.in
-		tests to the toplevel kadmin configure.in
-
-Wed Feb 18 16:01:35 1998  Tom Yu  <tlyu@mit.edu>
-
-	* Makefile.in: Remove trailing slash from thisconfigdir.  Fix up
-	BUILDTOP for new conventions.
-
-Mon Feb  2 17:02:29 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-
-	* Makefile.in: Define BUILDTOP and thisconfigdir in the Makefile
-
-Sat Feb 22 15:12:17 1997  Ezra Peisach  <epeisach@mit.edu>
-
-	* configure.in: Do not run test suite unless Athena compatibility
-		is specified as well as tcl, Perl, runtest.
-
-	* Makefile.in (check): Do not run tests unless really setup to do so.
-
-Mon Nov 11 20:51:58 1996  Tom Yu  <tlyu@mit.edu>
-
-	* configure.in: Add AC_CANONICAL_HOST to deal with new pre.in.
-
-Mon Oct 21 17:19:41 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* v4server.0/setup-srvtab.exp: use KRB5_KTNAME instead of
- 	ovsec_adm.srvtab explicitly
-
-	* lib/helpers.exp: don't specify -k ovsec_adm.srvtab on the
- 	command line, since kadmind4 now uses the config param value
- 	[krb5-admin/30]
-
-	* v4server.1/access.exp: start kadmin by cd'ing to the directory
- 	first, so ps can find the process
-
-Thu Sep 26 17:52:21 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* Makefile.in, remove_changepw_perms.sh, lib/helpers.exp,
- 	vrserver.0/setup-srvtab.exp, v4server.1/access.exp: use $K5ROOT
- 	instead of /krb5
-
-Mon Sep 23 15:34:56 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* adapt to krb5 build system: create Makefile.in, configure.in,
- 	update paths in unix.exp, move helpers.exp to lib
-
-Tue Aug 20 13:33:29 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* Makefile.ov, helpers.exp, v4server.1/change-password.exp: use
- 	kadmin.local instead of kdb5_edit
-
-Mon Jul 15 17:15:51 1996  Marc Horowitz  <marc@mit.edu>
-
-	* helpers.exp (exp_prog): the check for non-newline-terminated
- 	stdout was causing failures where there weren't any.  Barry
- 	doesn't remember why this was here to begin with.
-	* Makefile.ov (unit-test-body), helpers.exp: some versions of
- 	runtest do not like digits in command-line variable names. 
- 	* Makefile.ov (unit-test-body), helpers.exp: ovsec_v4adm_server
- 	renamed to kadmind4
-	* getpid.sh: grep out any programs with expect or kadmind4 in
- 	their names.
-
-
diff --git a/src/kadmin/v4server/unit-test/Makefile.in b/src/kadmin/v4server/unit-test/Makefile.in
deleted file mode 100644
index a746dadda..000000000
--- a/src/kadmin/v4server/unit-test/Makefile.in
+++ /dev/null
@@ -1,32 +0,0 @@
-thisconfigdir=./../..
-myfulldir=kadmin/v4server/unit-test
-mydir=v4server/unit-test
-BUILDTOP=$(REL)..$(S)..$(S)..
-#
-# $Id$
-#
-
-check:: check-@DO_V4_TEST@
-
-# When the tests get updated, nuke this and delete "-not" from the next two.
-check- check-ok::
-	@echo "+++"
-	@echo "+++ WARNING: kadmin/v4server unit tests out of date; not run."
-	@echo "+++"
-
-check--not::
-	@echo "+++"
-	@echo "+++ WARNING: kadmin/v4server unit tests not run."
-	@echo "+++ Either Athena compatibility, tcl, runtest, or Perl is unavailable."
-	@echo "+++"
-
-check-ok-not unit-test:: unit-test-setup unit-test-body unit-test-cleanup
-
-unit-test-setup::
-	$(ENV_SETUP) $(START_SERVERS_LOCAL) -v4files -kdcport 750 -keysalt des-cbc-crc:v4
-
-unit-test-body::
-	$(ENV_SETUP) $(RUNTEST) VFOURSERVER=../kadmind4 --tool v4server
-
-unit-test-cleanup::
-	$(ENV_SETUP) $(STOP_SERVERS_LOCAL) -v4files
diff --git a/src/kadmin/v4server/unit-test/config/ChangeLog b/src/kadmin/v4server/unit-test/config/ChangeLog
deleted file mode 100644
index 663822373..000000000
--- a/src/kadmin/v4server/unit-test/config/ChangeLog
+++ /dev/null
@@ -1,16 +0,0 @@
-Mon Oct 21 17:20:04 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* unix.exp: specify kadmind's path and name separately, to make it
- 	easy to cd to the path before exec'ing
-
-Tue Aug 20 13:34:07 1996  Barry Jaspan  <bjaspan@mit.edu>
-
-	* unix.exp: use kadmin.local instead of kdb5_edit
-
-Mon Jul 15 17:18:56 1996  Marc Horowitz  <marc@mit.edu>
-
-	* unix.exp: some versions of runtest do not like digits in
- 	command-line variable names.  ovsec_edit_keytab renamed to
- 	kadm5_keytab
-	
-
diff --git a/src/kadmin/v4server/unit-test/config/unix.exp b/src/kadmin/v4server/unit-test/config/unix.exp
deleted file mode 100644
index 5a8a477e9..000000000
--- a/src/kadmin/v4server/unit-test/config/unix.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-global env
-
-set kill /bin/kill
-
-if {[file exists /bin/sleep]} {
-    set sleep /bin/sleep
-} else {
-    set sleep /usr/bin/sleep
-}
-
-set kpasswd_v4 /usr/athena/bin/kpasswd
-set ovpasswd $env(TOP)/kpasswd/kpasswd
-set kadmin_local $env(TOP)/cli/kadmin.local
-set remove_changepw_perms $srcdir/remove_changepw_perms.sh
-set getpid $srcdir/getpid.sh
-set ovsec_adm_server_path $env(TOP)/server
-set ovsec_adm_server_name ./kadmind
-set ovsec_edit_keytab $env(TOP)/keytab/kadm5_keytab
-set hostname [exec hostname]
-
-# change-password.exp sends ^C to kpasswd to kill it; on HP-UX the
-# default intr character is DEL, and setting it on all platforms
-# won't hurt
-set stty_init "intr \\^c"
-
-if {[info commands exp_version] != {}} {
-	set exp_version_4 [regexp {^4} [exp_version]]
-} else {
-	set exp_version_4 [regexp {^4} [expect_version]]
-}
-
-# Backward compatibility until we're using expect 5 everywhere
-if {$exp_version_4} {
-	global wait_error_index wait_errno_index wait_status_index
-	set wait_error_index 0
-	set wait_errno_index 1
-	set wait_status_index 1
-} else {
-	set wait_error_index 2
-	set wait_errno_index 3
-	set wait_status_index 3
-}
diff --git a/src/kadmin/v4server/unit-test/getpid.sh b/src/kadmin/v4server/unit-test/getpid.sh
deleted file mode 100644
index 5c1b1a690..000000000
--- a/src/kadmin/v4server/unit-test/getpid.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# tcl sucks big fat hairy rocks
-
-$PS_ALL | awk "/$1/"' && !/awk/ && !/getpid/ && !/expect/ && !/kadmind4/ { print $2 }'
diff --git a/src/kadmin/v4server/unit-test/lib/helpers.exp b/src/kadmin/v4server/unit-test/lib/helpers.exp
deleted file mode 100644
index a3087dc14..000000000
--- a/src/kadmin/v4server/unit-test/lib/helpers.exp
+++ /dev/null
@@ -1,238 +0,0 @@
-proc server_pids { } {
-    global env
-
-    return [eval [concat exec $env(PS_ALL) | \
-	    awk {{/kadmind4/ && !/awk/ && !/expect/ {printf("%d ", $2)}}}]]
-}
-
-proc server_exit { name status } {
-    global wait_error_index wait_errno_index wait_status_index
-    global server_id
-    global kill
-
-    verbose "$name: stopping V4 kpasswd server." 1
-
-    # We can't know whether the process exists or not, so we have
-    # to ignore errors.  XXX will close ever time out?
-    catch {close $server_id}
-    set pids [server_pids]
-    if {$pids != {}} {
-	verbose "server_exit killing process(es) $pids"
-	catch {exec $kill $pids}
-    } else {
-	verbose "server_exit: couldn't find running server(s) to kill"
-    }
-
-    # wait hangs on AIX if the process was killed; since status == -1
-    # in that case, solve the problem by not waiting; the zombies will
-    # be cleaned up when the test finishes
-    if {$status == -1} {
-	return 1
-    }
-
-    set ret [wait -i $server_id]
-    verbose "% Exit $ret" 2
-
-    if {[lindex $ret $wait_error_index] == -1} {
-	fail "$name: wait returned error [lindex $ret $wait_errno_index]"
-	return 0
-    } else {
-	if { [lindex $ret $wait_status_index] == $status ||
-	(($status<0) && ([lindex $ret $wait_status_index] == ($status+256))) } {
-	    pass "$name"
-	} else {
-	    fail "$name: unexpected return status [lindex $ret $wait_status_index], should be $status"
-	    return 0
-	}
-    }
-
-    return 1
-}
-
-proc myfail { msg } {
-	global mytest_status
-	fail "$msg"
-	set mytest_status 1
-}
-
-proc server_start { name cmdline should_listen args } {
-    global spawn_id server_id env
-    global VFOURSERVER
-    global mytest_status
-    global sleep hostname
-
-    set max_tries 60
-
-    verbose "$name: starting V4 kpasswd server." 1
-
-    for {set num_tries 0} {$num_tries <= $max_tries} {incr num_tries} {
-	if {$num_tries} {
-	    exec $sleep 5
-	    verbose "Couldn't connect to V4 kpasswd server; retrying ($num_tries so far)."
-	}
-
-	spawn $VFOURSERVER $cmdline
-	set server_id $spawn_id
-
-	foreach test $args {
-	    set mytest_status 0
-	    uplevel 1 "expect {
-		-i $server_id
-		$test
-		timeout { myfail \"$name: timeout\" }
-		eof { myfail \"$name: eof while expecting string\" }
-	    }"
-
-	    if {$mytest_status == 1} { 
-		return 0
-	    }
-	}
-
-	set pids [server_pids]
-
-	if {$should_listen} {
-	    exec $sleep 1
-	    set save_spawn_id $spawn_id
-	    spawn telnet $hostname kerberos_master
-	    expect {
-		{Connection refused} {
-		    close -i $save_spawn_id
-		    wait -i $save_spawn_id
-		    close
-		    wait
-		    continue
-		}
-		{Connected} {
-		    send "close\n"
-		    close
-		    wait
-		    set spawn_id $save_spawn_id
-		    break
-		}
-		default {
-		    close -i $save_spawn_id
-		    wait -i $save_spawn_id
-		    catch {close}
-		    wait
-		    continue
-		}
-	    }
-	} else {
-	    break
-	}
-    }
-
-    if {$pids == {}} {
-	# Try twice to find the server processes.  Not sure why,
-	# but there seems to be some sort of race condition in the OS.
-
-	verbose "server_start: couldn't find server process(es) -- trying again"
-	exec $sleep 1
-	set pids [server_pids]
-    }
-
-    if {$num_tries > $max_tries} {
-	myfail "$name: couldn't connect to V4 kpasswd server"
-	return 0
-    } else {
-	if {$pids != {}} {
-	    verbose "server_start: server process ID(s) is/are $pids"
-	}
-	pass "$name"
-	return 1
-    }
-}
-
-proc exp_prog { name prog cmdline status args } {
-	global spawn_id spawn_pid
-	global mytest_status
-	global wait_error_index wait_errno_index wait_status_index
-
-	verbose "$name: spawning $prog $cmdline" 1
-
-	set spawn_pid [eval "spawn $prog $cmdline"]
-
-	# at the end, eof is success
-
-#	lappend args { eof { if {[regexp "\[\r\n\]$" $expect_out(buffer)] == 0} { myfail "final status message not newline-terminated" } } }
-	lappend args { eof {} }
-
-	foreach test $args {
-		set mytest_status 0
-		uplevel 1 "expect {
-			$test
-			timeout { close; myfail \"$name: timeout\" }
-		      eof { myfail \"$name: eof while expecting string\" }
-		}"
-
-		if {$mytest_status == 1} { return 0 }
-	}
-
-	# at this point, the id is closed and we can wait on it.
-
-	set ret [wait]
-	verbose "% Exit $ret" 2
-
-	if {$status == -1} { return 1 }
-
-	if {[lindex $ret $wait_error_index] == -1} {
-		fail "$name: wait returned error [lindex $ret $wait_errno_index]"
-	} else {
-		if { [lindex $ret $wait_status_index] == $status ||
-		     (($status<0) && ([lindex $ret $wait_status_index] == ($status+256))) } {
-			pass "$name"
-		} else {
-			fail "$name: unexpected return status [lindex $ret $wait_status_index], should be $status"
-		}
-	}
-
-	return 1
-}
-
-proc fix_salt { name fullname oldpw newpw } {
-	global kadmin_local
-
-	exp_prog "$name: kadmin.local" $kadmin_local "" 0 {
-		"kadmin.local:" { send "cpw $fullname\n" }
-	} {
-		"Enter password for principal \"$fullname\":" { 
-		    send "$newpw\n" 
-		}
-	} {
-		"Re-enter password for principal \"$fullname\":" { 
-		    send "$newpw\n"
-		}
-	} {
-	        # if we get cannot reuse pw, the salt is already right
-	        -re "Password .* changed." { send "quit\n" }
-		-re "Cannot reuse password" { send "quit\n" }
-	}
-}
-
-proc unexpire { name fullname } {
-    global kadmin_local
-    
-    # While we're at it, make sure they aren't expired.
-    exp_prog "$name: kadmin.local" $kadmin_local "" 0 {
-	"kadmin.local:" {
-	    send "modprinc -expire \"May 6, 2029\" $fullname\n" 
-	}
-    } { 
-	-re "Principal .* modified." { send "quit\n" }
-    }
-}
-
-proc kpasswd_v4 { name fullname status oldpw newpw args } {
-	global kpasswd_v4 s
-
-	eval [concat {
-		exp_prog $name $kpasswd_v4 "-u $fullname" $status {
-			-re "Old password for $fullname:" { send "$oldpw\n" }
-		} {
-			-re "New Password for $fullname:" { send "$newpw\n" }
-		} {
-		   -re "Verifying, please re-enter New Password for $fullname:"
-				{ send "$newpw\n" }
-		}
-		} $args]
-}
diff --git a/src/kadmin/v4server/unit-test/remove_changepw_perms.sh b/src/kadmin/v4server/unit-test/remove_changepw_perms.sh
deleted file mode 100644
index 226931801..000000000
--- a/src/kadmin/v4server/unit-test/remove_changepw_perms.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-# tcl sucks big fat hairy rocks
-
-ed $K5ROOT/ovsec_adm.acl <<EOF >/dev/null 2>&1
-g/changepw\/kerberos/s/^/#/
-w
-q
-EOF
diff --git a/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp b/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp
deleted file mode 100644
index f74e8f214..000000000
--- a/src/kadmin/v4server/unit-test/v4server.0/setup-srvtab.exp
+++ /dev/null
@@ -1,18 +0,0 @@
-load_lib "helpers.exp"
-
-set timeout 10
-
-exp_prog "setup" $kadmin_local "" 0 {
-    "kadmin.local:" { send "ank -randkey changepw/kerberos\n" }
-} {
-    "created" {}
-    "already exists" {}
-} {
-    "kadmin.local:" { 
-	send "ktadd -k $env(KRB5_KTNAME) changepw/kerberos\n"
-    }
-} {
-    -re "Entry for principal changepw/kerberos .* added to keytab" {
-	send "quit\n"
-    }
-}
diff --git a/src/kadmin/v4server/unit-test/v4server.1/access.exp b/src/kadmin/v4server/unit-test/v4server.1/access.exp
deleted file mode 100644
index 57ec5040b..000000000
--- a/src/kadmin/v4server/unit-test/v4server.1/access.exp
+++ /dev/null
@@ -1,90 +0,0 @@
-load_lib "helpers.exp"
-
-set timeout 30
-
-# Setup: make sure the principals we will use have V4 salt
-fix_salt "A.setup" testuser notathena notathena
-unexpire "A.setup" testuser
-unexpire "A.setup" changepw/kerberos
-
-proc kill_admin_server {} {
-	global env kill getpid
-
-	set pid [exec $getpid kadmind]
-	if {$pid != ""} {
-		exec $kill $pid
-	}
-}
-
-proc start_admin_server {} {
-    global ovsec_adm_server_path ovsec_adm_server_name sleep env
-
-    set max_tries 60
-
-    for {set num_tries 0} {$num_tries <= $max_tries} {incr num_tries} {
-	if {$num_tries} {
-	    exec $sleep 5
-	    verbose "$ovsec_adm_server couldn't bind; retrying ($num_tries so far)"
-	}
-	if {[catch "system {cd $ovsec_adm_server_path; exec $ovsec_adm_server_name}" msg]} {
-	    if {[regexp {Address already in use} $msg]} {
-		continue
-	    }
-	    fail "starting $ovsec_adm_server_name: $msg"
-	}
-	return
-    }
-    fail "starting $ovsec_adm_server_name: $msg"
-}
-	
-proc remove_changepw_perms {} {
-	global remove_changepw_perms
-
-	exec $remove_changepw_perms
-}
-
-proc set_changepw_perms { perms } {
-        global env
-
-	remove_changepw_perms
-
-	exec echo "changepw/kerberos@SECURE-TEST.OV.COM	$perms" \
-		>> $env(K5ROOT)/ovsec_adm.acl
-}
-
-# start off with a dead admin server
-kill_admin_server
-
-set_changepw_perms "i"
-start_admin_server
-server_start A.1 "-n" 1 {
-	"KADM Server starting in the OVSEC_KADM mode" {}
-}
-kpasswd_v4 A.1 testuser 2 notathena foobar {
-	"Operation requires ``change-password'' privilege" {}
-} {
-	"$kpasswd_v4: Insufficient access to perform requested operation while attempting to change password." {}
-} {
-	"Password NOT changed." {}
-}
-server_exit A.1 -1
-kill_admin_server
-
-set_changepw_perms "c"
-start_admin_server
-server_start A.2 "-n" 1 {
-	"KADM Server starting in the OVSEC_KADM mode" {}
-}
-kpasswd_v4 A.2 testuser 2 notathena foobar {
-	"Operation requires ``get'' privilege" {}
-} {
-	"$kpasswd_v4: Insufficient access to perform requested operation while attempting to change password." {}
-} {
-	"Password NOT changed." {}
-}
-server_exit A.2 -1
-kill_admin_server
-
-set_changepw_perms "ci"
-
-start_admin_server
diff --git a/src/kadmin/v4server/unit-test/v4server.1/change-password.exp b/src/kadmin/v4server/unit-test/v4server.1/change-password.exp
deleted file mode 100644
index cc8e08406..000000000
--- a/src/kadmin/v4server/unit-test/v4server.1/change-password.exp
+++ /dev/null
@@ -1,60 +0,0 @@
-load_lib "helpers.exp"
-
-set timeout 30
-
-spawn stty -a
-expect { eof {} }
-wait
-
-# Setup: make sure the principals we will use have V4 salt
-fix_salt "CPW.setup" testuser notathena notathena
-fix_salt "CPW.setup" pol1 pol111111 pol111111
-fix_salt "CPW.setup" pol2 pol222222 pol222222
-unexpire "CPW.setup" testuser
-unexpire "CPW.setup" pol1
-unexpire "CPW.setup" pol2
-unexpire "CPW.setup" changepw/kerberos
-
-server_start "CPW.all" "-n" 1 {
-	"KADM Server starting in the OVSEC_KADM mode" {}
-}
-
-kpasswd_v4 CPW.1 testuser 0 notathena foobar { "Password changed." {} }
-kpasswd_v4 CPW.1 testuser 0 foobar notathena { "Password changed." {} }
-
-kpasswd_v4 CPW.3 pol1 -1 pol111111 foo {
-	"New password is too short." {}
-} {
-	"$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break }
-}
-
-kpasswd_v4 CPW.4 pol1 -1 pol111111 foooooooo {
-	"New password does not have enough character classes." {}
-} {
-	"$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break }
-}
-
-kpasswd_v4 CPW.5 pol1 -1 pol111111 Abyssinia {
-	"New password was found in a dictionary" {}
-} {
-	"$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break }
-}
-
-kpasswd_v4 CPW.6.setup pol1 0 pol111111 polAAAAAA { "Password changed." {} }
-kpasswd_v4 CPW.6 pol1 -1 polAAAAAA pol111111 {
-	"New password was used previously." {}
-} {
-	"$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break }
-}
-
-# We used to use kdb5_edit, which reset last_pwd_change.  Now we used
-# kadmin.local, which doesn't, so we have to wait out the min life.
-exec $sleep 30
-kpasswd_v4 CPW.7.setup pol2 0 pol222222 polBBBBBB { "Password changed." {} }
-kpasswd_v4 CPW.7 pol2 -1 polBBBBBB pol222222 {
-	"Password cannot be changed because it was changed too recently." {}
-} {
-	"$kpasswd_v4: Insecure password rejected while attempting to change password." { send "\003\n"; close; break }
-}
-
-server_exit "CPW.all" -1
diff --git a/src/kadmin/v4server/unit-test/v4server.1/usage.exp b/src/kadmin/v4server/unit-test/v4server.1/usage.exp
deleted file mode 100644
index 4d292067a..000000000
--- a/src/kadmin/v4server/unit-test/v4server.1/usage.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-load_lib "helpers.exp"
-
-set timeout 10
-
-server_start "U.1: -h" "-h" 0 {
-	-re {Usage: .*} {}
-} {
-	eof {}
-}
-server_exit "U.1: -h" 255
-
-server_start "U.4: -n" "-n" 1 {
-	"Enter KDC database master key:" {
-		myfail "unexpected password prompt"
-	}
-	"KADM Server starting in the OVSEC_KADM mode" {}
-}
-
-server_exit "U.4: -n" -1
-
-server_start "U.5: no -n" "" 1 {
-	"KADM Server starting in the OVSEC_KADM mode" {}
-} {
-	"Enter KDC database master key:" { send "mrroot\n" }
-}
-server_exit "U.5: no -n" -1