remove keytab directory

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

10 files changed, 0 insertions, 534 deletions

diff --git a/src/kadmin/keytab/unit-test/ChangeLog b/src/kadmin/keytab/unit-test/ChangeLog
deleted file mode 100644
index 69df6be92..000000000
--- a/src/kadmin/keytab/unit-test/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-Mon Jul 15 17:03:28 1996  Marc Horowitz  <marc@mit.edu>
-
-	* Makefile.ov (unit-test-body): ovsec_adm_keytab is now
- 	kadm5_keytab
diff --git a/src/kadmin/keytab/unit-test/Makefile.ov b/src/kadmin/keytab/unit-test/Makefile.ov
deleted file mode 100644
index 1b3366d8b..000000000
--- a/src/kadmin/keytab/unit-test/Makefile.ov
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# $Id$
-#
-
-TOP = ../..
-include $(TOP)/config.mk/template
-
-unit-test:: unit-test-setup unit-test-body unit-test-cleanup
-
-unit-test-body::
-	$(CLNTTCL) ./del-princs.tcl
-	$(RUNTEST) KEYTAB=../kadm5_keytab \
-		KLIST=../../../clients/klist/klist \
-		QUALNAME=../../testing/scripts/qualname --tool keytab
-    
-unit-test-setup::
-	$(START_SERVERS)
-	$(CLNTTCL) ./add-princs.tcl
-
-unit-test-cleanup::
-	$(STOP_SERVERS)
diff --git a/src/kadmin/keytab/unit-test/add-princs.tcl b/src/kadmin/keytab/unit-test/add-princs.tcl
deleted file mode 100644
index 247a4382b..000000000
--- a/src/kadmin/keytab/unit-test/add-princs.tcl
+++ /dev/null
@@ -1,12 +0,0 @@
-source $env(TCLUTIL)
-
-ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null \
-	$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle
-
-ovsec_kadm_create_principal $server_handle [simple_principal kttest1] \
-	{OVSEC_KADM_PRINCIPAL} kttest1
-
-ovsec_kadm_create_principal $server_handle [simple_principal kttest2] \
-	{OVSEC_KADM_PRINCIPAL} kttest2
-
-ovsec_kadm_destroy $server_handle
diff --git a/src/kadmin/keytab/unit-test/config/unix.exp b/src/kadmin/keytab/unit-test/config/unix.exp
deleted file mode 100644
index bc07d4f6e..000000000
--- a/src/kadmin/keytab/unit-test/config/unix.exp
+++ /dev/null
@@ -1,46 +0,0 @@
-set klist $KLIST
-set hostname hostname
-set qualname $QUALNAME
-
-set rm /bin/rm
-
-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
-}
-
-proc keytab_version {} {
-	global KEYTAB
-	puts "$KEYTAB version unknown"
-}
-
-proc keytab_load {} {
-	#
-}
-
-proc keytab_exit {} {
-	#
-}
-
-proc keytab_start { args } {
-	global KEYTAB
-	global spawn_id
-
-	verbose "% $KEYTAB $args" 1
-	eval spawn $KEYTAB $args
-}
-
-
diff --git a/src/kadmin/keytab/unit-test/del-princs.tcl b/src/kadmin/keytab/unit-test/del-princs.tcl
deleted file mode 100644
index 9b9cab5c4..000000000
--- a/src/kadmin/keytab/unit-test/del-princs.tcl
+++ /dev/null
@@ -1,24 +0,0 @@
-source $env(TCLUTIL)
-
-proc check_err {error} {
-    if {! [string match {*OVSEC_KADM_UNK_PRINC*} $error]} {
-	error $error
-    }
-}
-
-proc delprinc {princ} {
-    global server_handle
-
-    catch {ovsec_kadm_delete_principal $server_handle $princ}
-    if {[info exists errorInfo]} {
-	check_err $errorInfo
-    }
-}
-    
-ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null \
-	$OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle
-
-delprinc dne1
-delprinc dne2
-
-ovsec_kadm_destroy $server_handle
diff --git a/src/kadmin/keytab/unit-test/helpers.exp b/src/kadmin/keytab/unit-test/helpers.exp
deleted file mode 100644
index a9f7ca402..000000000
--- a/src/kadmin/keytab/unit-test/helpers.exp
+++ /dev/null
@@ -1,132 +0,0 @@
-#
-# $Id$
-#
-
-#
-# Create a keytab "name" with an entry for each element in the array
-# "entries".  If "name" already exists it is destroyed.  Connections
-# to the admin server are made as the principal "admin" with the
-# password "password".
-#
-proc setup_keytab { testname ktname admin password entries } {
-	global klist rm
-	global wait_error_index wait_status_index
-	global verbose
-
-	verbose "setting up test: $testname" 1
-
-	if {[regexp {(.+):(.+)} $ktname dummy type filename] == 0} {
-		set filename $ktname
-	}
-
-	if {[file exists $filename] && [catch "exec $rm $filename"] != 0} {
-		error "$testname: cannot delete keytab file $filename";
-	}
-
-	if {$type == "WRFILE"} {
-		set type "FILE"
-	}
-
-	foreach entry $entries {
-		keytab_run "$testname setup" \
-			"-k $ktname -a -p $admin $entry" 0 {
-			"Enter password:" { 
-				send "$password\n"
-			}
-		}
-		# if "Enter password:" needs to be optional:
-		# { timeout { } }
-	}
-	
-	if {$verbose > 1} {
-		if {[file exists $filename]} {
-			puts "% exec $klist -k $type:$filename\n"
-			if {[catch "exec $klist -k $type:$filename"] != 0} {
-				error "$testname: $klist failed"
-			}
-		}
-	}
-}
-
-# 
-# Run $KEYTAB with args ktargs.  Each element of args is treated as an
-# expect block for the process, in turn.  If all elements match and
-# then eof occurs with exit status status, the test passes; otherwise
-# it fails.
-#
-proc keytab_run { testname ktargs status args } {
-	global spawn_id timeout
-	global wait_error_index wait_status_index
-	global progname
-
-	verbose "running $progname for test: $testname" 2
-
-	eval keytab_start $ktargs
-
-	# wait for eof after exps
-	lappend args { eof { verbose $expect_out(buffer) 2 } }
-
-	foreach exp $args {
-		uplevel 1 "expect {
-			$exp
-			timeout { close; fail \"$testname: timeout\"; return }
-			eof { fail \"$testname: eof before expected message\"; return }
-		}"
-	}
-
-	set ret [wait]
-	verbose "% Exit $ret" 2
-
-	if {[lindex $ret $wait_error_index] == -1} {
-		fail "$testname: 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 "$testname"
-		} else {
-			fail "$testname: unexpected return status [lindex $ret $wait_status_index], should be $status"
-		}
-	}
-}
-
-
-proc klist_check { testname ktname args } {
-	global klist
-
-	if {[regexp {(.+):(.+)} $ktname dummy type filename] == 0} {
-		set filename $ktname
-	}
-
-	set lines [list "^Keytab name: (WR)?FILE:$filename" \
-			"^KVNO Principal" "^---- -------"]
-
-	foreach entry $args {
-		if {[lindex $entry 1] == 0} {
-			set line "^ *\[0-9\]+ [lindex $entry 0]"
-		} else {
-			set line "^ *[lindex $entry 1] [lindex $entry 0]"
-		}
-		lappend lines $line
-	}
-
-	set kl [open "|$klist -k FILE:$filename" r]
-
-	while {[gets $kl line] >= 0} {
-		if {([llength $lines] == 0) ||
-		    ([regexp [lindex $lines 0] $line] == 0)} {
-			fail "$testname: klist check: \
-				[lindex $lines 0] does not match $line"
-		}
-		set lines [lrange $lines 1 end]
-	}
-	if {[catch "close $kl" msg] != 0} {
-		fail "$testname: klist: $msg"
-		return
-	}
-
-	if {[llength $lines] == 0} {
-		pass "$testname: klist check"
-	} else {
-		fail "$testname: klist check: too few entries in keytab"
-	}
-}
diff --git a/src/kadmin/keytab/unit-test/keytab.0/ChangeLog b/src/kadmin/keytab/unit-test/keytab.0/ChangeLog
deleted file mode 100644
index 1b807089a..000000000
--- a/src/kadmin/keytab/unit-test/keytab.0/ChangeLog
+++ /dev/null
@@ -1,4 +0,0 @@
-Mon Jul 15 17:09:01 1996  Marc Horowitz  <marc@mit.edu>
-
-	* keytab-spec.exp: use /krb5/v5srvtab, since /krb5 is the test
- 	dir.
diff --git a/src/kadmin/keytab/unit-test/keytab.0/adding.exp b/src/kadmin/keytab/unit-test/keytab.0/adding.exp
deleted file mode 100644
index 159ac638b..000000000
--- a/src/kadmin/keytab/unit-test/keytab.0/adding.exp
+++ /dev/null
@@ -1,119 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 20
-
-load_lib "helpers.exp"
-
-if {[regexp {(.*/)?([^/]*)} $KEYTAB dummy dir progname] == 0} {
-	error "cannot set progname from $KEYTAB"
-}
-
-set ktscratch_file /tmp/keytab_test
-set ktscratch WRFILE:$ktscratch_file
-set ktarg "-k $ktscratch"
-set add_admin "$ktarg -a -p admin"
-set pwprompt { "Enter password:" { send "admin\n" } }
-
-setup_keytab "A1,A6" $ktscratch admin admin {} 
-keytab_run "A1,A6" "$add_admin kttest1" 0 "$pwprompt" {
-	-re \
-  "$progname: Entry.*kttest1.*kvno \[0-9\]+.*keytab $ktscratch." {}
-}
-klist_check "A1,A6" $ktscratch {kttest1 0}
-
-setup_keytab "A2" $ktscratch admin admin {} 
-keytab_run "A2" "-q $add_admin kttest1" 0 "$pwprompt" {
-	-re
-  "$progname: Entry.*kttest1.*kvno \[0-9\]+.*keytab $ktscratch." {
-		close; fail "A2: -q"; return }
-	eof { break }
-}
-klist_check "A2" $ktscratch {kttest1 0}
-
-setup_keytab "A3" $ktscratch admin admin {kttest1 kttest1} 
-set kvno_key1 [exec $klist -k -K FILE:$ktscratch_file | \
-		awk "/kttest1/ && NR==4 {print \$1 \" \" \$3}"]
-set kvno_key2 [exec $klist -k -K FILE:$ktscratch_file | \
-		awk "/kttest1/ && NR==5 {print \$1 \" \" \$3}"]
-if {[lindex $kvno_key1 1] == [lindex $kvno_key2 1]} {
-	fail "A3: key compare"
-} else {
-	klist_check "A3" $ktscratch "kttest1 [lindex $kvno_key1 0]" \
-				    "kttest1 [expr [lindex $kvno_key1 0]+1]"
-}
-
-setup_keytab "A7" $ktscratch admin admin {}
-keytab_run "A7" "$add_admin does-not-exist" 1 "$pwprompt" {
-	-re
-  "$progname: Principal does-not-exist does not exist." {}
-}
-
-setup_keytab "A4,A10,A11,A13,A15" $ktscratch admin admin { kttest1  kttest2}
-keytab_run "A4,A10,A11,A13,A15" "$ktarg -a kttest1" 0
-keytab_run "A4,A10,A11,A13,A15" "$ktarg -a  kttest2" 0
-keytab_run "A4,A10,A11,A13,A15" "$ktarg -a kttest1" 0
-keytab_run "A4,A10,A11,A13,A15" "$ktarg -a  kttest2" 0
-klist_check "A4,A10,A11,A13,A15" $ktscratch { kttest1 0 } \
-	{ kttest2 0 } { kttest1 0 } { kttest2 0 } { kttest1 0 } { kttest2 0 }
-
-setup_keytab "A12" $ktscratch admin admin {}
-keytab_run "A12" "$ktarg -a -p admin/get-add kttest1" 1 "$pwprompt" {
-	"Operation requires ``change-password'' privilege while changing" {}
-}
-
-setup_keytab "A14" $ktscratch admin admin {}
-# assume the exit status won't be -1, so if the password prompt
-# doesn't appear the test will fail 
-keytab_run "A14" "$ktarg -a kttest1" -1 {
-	"Enter password:" { send "\n"; expect eof; pass "A14: no -p"; return }
-}
-
-setup_keytab "A16" $ktscratch admin admin {}
-keytab_run "A16" "$ktarg -a -p does-not-exist kttest1" 1 {
-	"$progname: Principal does-not-exist does not exist." {}
-}
-
-setup_keytab "A17" $ktscratch admin admin { kttest1  kttest2}
-keytab_run "A17" "$ktarg -a -p kttest2 kttest1" 1 {
-	"Enter password:" { close; fail "A17: no password prompt"; return }
-	default { break }
-}
-
-setup_keytab "A18" $ktscratch admin admin { }
-keytab_run "A18" "$ktarg -a -c -p admin dne1" 0 "$pwprompt" {
-	"$progname: Created principal dne1" {}
-} {
-	-re
-  "$progname: Entry.*dne1.*kvno \[0-9\]+.*keytab $ktscratch." {}
-}
-klist_check "A18" $ktscratch {dne1 0}
-	
-setup_keytab "A19" $ktscratch admin admin {} 
-keytab_run "A9" "-q $ktarg -a -c -p admin dne2" 0 "$pwprompt" {
-	"$progname: Created principal dne2" { close; fail "A19: -q"; return }
-	eof { break }
-}
-klist_check "A19" $ktscratch {dne2 0}
-
-setup_keytab "A21" $ktscratch admin admin {} 
-keytab_run "A21" "$ktarg -a -c -p admin kttest1" 0 "$pwprompt" {
-	"$progname: Principal kttest1 already exists." {}
-} {
-	-re \
-  "$progname: Entry.*kttest1.*kvno \[0-9\]+.*keytab $ktscratch." {}
-}
-klist_check "A21" $ktscratch {kttest1 0}
-
-setup_keytab "A22" $ktscratch admin admin {}
-keytab_run "A22" "$ktarg -a -c -p admin/modify kttest1" 1 "$pwprompt" {
-	"Operation requires ``add'' and ``modify'' privileges while creating" {}
-}
-
-setup_keytab "A23" $ktscratch admin admin {}
-keytab_run "A23" "$ktarg -a -c -p admin/get kttest1" 1 "$pwprompt" {
-	"Operation requires ``add'' and ``modify'' privileges while creating" {}
-}
-
-exec rm -f $ktscratch_file
diff --git a/src/kadmin/keytab/unit-test/keytab.0/keytab-spec.exp b/src/kadmin/keytab/unit-test/keytab.0/keytab-spec.exp
deleted file mode 100644
index 8da80eb69..000000000
--- a/src/kadmin/keytab/unit-test/keytab.0/keytab-spec.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 10
-
-load_lib "helpers.exp"
-
-if {[regexp {(.*/)?([^/]*)} $KEYTAB dummy dir progname] == 0} {
-	error "cannot set progname from $KEYTAB"
-}
-
-set hname [exec $hostname]
-set qname [exec $qualname $hname]
-
-set testfile1 /tmp/keytab-test1
-set testfile2 /tmp/keytab-test2
-
-if {[info exists env(KRB5_KTNAME)]} {
-    set ktname_orig $env(KRB5_KTNAME)
-    unset env(KRB5_KTNAME)
-}
-
-setup_keytab "K1" WRFILE:/krb5/v5srvtab admin admin "host/$qname"
-klist_check "K1" FILE:/krb5/v5srvtab "host/$qname 0" 
-keytab_run "K1" "-a host/$qname" 0
-klist_check "K1" FILE:/krb5/v5srvtab "host/$qname 0" "host/$qname 0"
-keytab_run "K1" "-r host/$qname old" 0
-klist_check "K1" FILE:/krb5/v5srvtab "host/$qname 0"
-
-if {[info exists ktname_orig]} {
-    set env(KRB5_KTNAME) $ktname_orig
-}
-
-setup_keytab "K2" WRFILE:$testfile1 admin admin {}
-keytab_run "K2" "-k WRFILE:$testfile1 -a -p admin kttest1" 0 {
-	"Enter password:" { send "admin\n" }
-}
-klist_check "K2" FILE:$testfile1 "kttest1 0"
-
-setup_keytab "K2" WRFILE:$testfile2 admin admin {}
-keytab_run "K3" "-k $testfile2 -a -p admin kttest1" 0 {
-	"Enter password:" { send "admin\n" }
-}
-klist_check "K3" FILE:$testfile2 "kttest1 0"
-
-exec rm -f $testfile1 $testfile2
diff --git a/src/kadmin/keytab/unit-test/keytab.0/removing.exp b/src/kadmin/keytab/unit-test/keytab.0/removing.exp
deleted file mode 100644
index a7a50f045..000000000
--- a/src/kadmin/keytab/unit-test/keytab.0/removing.exp
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-# $Id$
-#
-
-set timeout 10
-
-load_lib "helpers.exp"
-
-if {[regexp {(.*/)?([^/]*)} $KEYTAB dummy dir progname] == 0} {
-	error "cannot set progname from $KEYTAB"
-}
-
-set ktscratch_file /tmp/keytab_test
-set ktscratch WRFILE:$ktscratch_file
-set ktarg "-k $ktscratch"
-
-# Get the kvnos we will need later
-setup_keytab "setup" $ktscratch admin admin { kttest1 kttest2 }
-set kvno1 [exec $klist -k -K FILE:$ktscratch_file | \
-		awk "/kttest1/ {print \$1}"]
-set kvno2 [exec $klist -k -K FILE:$ktscratch_file | \
-		awk "/kttest2/ {print \$1}"]
-
-setup_keytab "R1" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R1" "$ktarg -r kttest1" 0 {
-	-re 
-	"$progname: Entry for principal kttest1 with kvno \[0-9\]+\
-	removed from keytab $ktscratch" {}
-}
-klist_check "R1" $ktscratch
-
-setup_keytab "R2" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R2" "$ktarg -q -r kttest1" 0 {
-	-re 
-	"$progname: Entry for principal kttest1 with kvno \[0-9\]+\
-	removed from keytab $ktscratch" { close; fail "R2: -q"; return }
-	eof { break }
-}
-klist_check "R2" $ktscratch
-
-setup_keytab "R3" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-klist_check "R3" $ktscratch "kttest1 $kvno1"
-keytab_run "R3" "$ktarg -r kttest1 $kvno1" 0
-klist_check "R3" $ktscratch
-
-setup_keytab "R4" $ktscratch admin admin { kttest1 kttest1 kttest1 }
-set kvno1 [expr $kvno1+3]
-klist_check "R4" $ktscratch "kttest1 [expr $kvno1-2]" \
-	"kttest1 [expr $kvno1-1]" "kttest1 $kvno1"
-keytab_run "R4" "$ktarg -r kttest1" 0
-klist_check "R4" $ktscratch "kttest1 [expr $kvno1-2]" \
-	"kttest1 [expr $kvno1-1]"
-
-setup_keytab "R5" $ktscratch admin admin { kttest1 kttest1 kttest1 }
-set kvno1 [expr $kvno1+3]
-keytab_run "R5" "$ktarg -r kttest1 old" 0
-klist_check "R5" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R6" $ktscratch admin admin { kttest1 kttest1 kttest1 }
-set kvno1 [expr $kvno1+3]
-keytab_run "R6" "$ktarg -r kttest1 old" 0
-klist_check "R6" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R7" $ktscratch admin admin { kttest1 kttest1 kttest1 }
-set kvno1 [expr $kvno1+3]
-keytab_run "R7" "$ktarg -r kttest1 all" 0 {
-	"$progname: Entry for principal kttest1" {} 
-} {
-	"$progname: Entry for principal kttest1" {}
-} {
-	"$progname: Entry for principal kttest1" {}
-}
-klist_check "R7" $ktscratch
-
-setup_keytab "R8" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R8" "$ktarg -r kttest2" 1 {
-	"$progname: No entry for principal kttest2 exists in keytab" {}
-}
-klist_check "R8" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R9" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R9" "$ktarg -r kttest2 1" 1 {
-   "$progname: No entry for principal kttest2 with kvno 1 exists in keytab" {}
-}
-klist_check "R9" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R10" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R10" "$ktarg -r kttest2 all" 1 {
-	"$progname: No entry for principal kttest2 exists in keytab" {}
-}
-klist_check "R10" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R11" $ktscratch admin admin { kttest1 }
-set kvno1 [expr $kvno1+1]
-keytab_run "R11" "$ktarg -r kttest1 old" 1 {
-	"$progname: There is only one entry for principal kttest1 in keytab" {}
-}
-klist_check "R11" $ktscratch "kttest1 $kvno1"
-
-setup_keytab "R13" $ktscratch admin admin { kttest1 kttest2 kttest1 }
-set kvno1 [expr $kvno1+2]
-set kvno2 [expr $kvno2+1]
-keytab_run "R13" "$ktarg -r kttest2 $kvno2" 0
-klist_check "R13" $ktscratch "kttest1 [expr $kvno1-1]" "kttest1 $kvno1"
-
-setup_keytab "R14" $ktscratch admin admin { kttest1 kttest2 kttest1 kttest2 }
-set kvno1 [expr $kvno1+2]
-set kvno2 [expr $kvno2+2]
-keytab_run "R14" "$ktarg -r kttest1 all" 0
-klist_check "R14" $ktscratch "kttest2 [expr $kvno2-1]" "kttest2 $kvno2"
-
-setup_keytab "R15" $ktscratch admin admin { kttest1 kttest2 kttest1 kttest2 }
-set kvno1 [expr $kvno1+2]
-set kvno2 [expr $kvno2+2]
-keytab_run "R15" "$ktarg -r kttest1 old" 0
-klist_check "R15" $ktscratch "kttest2 [expr $kvno2-1]" \
-	"kttest1 $kvno1" "kttest2 $kvno2"
-
-exec rm -f $ktscratch_file