Remove per-realm parameters and prompting. No longer needed with KDC profile

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

2 files changed, 13 insertions, 22 deletions

diff --git a/src/tests/dejagnu/krb-standalone/ChangeLog b/src/tests/dejagnu/krb-standalone/ChangeLog
index 97f2b5092..3dc93a38d 100644
--- a/src/tests/dejagnu/krb-standalone/ChangeLog
+++ b/src/tests/dejagnu/krb-standalone/ChangeLog
@@ -1,3 +1,10 @@
+
+Mon Jul 17 15:27:34 EDT 1995	Paul Park	(pjpark@mit.edu)
+	* kadmin.exp - Remove parameters from command lines of admin utilities
+		because they're not needed anymore since we have the KDC
+		profile.  Also remove prompting for the master key since we
+		have full usage of the stash file.
+
 Fri Jun  9 23:45:57 1995  Theodore Y. Ts'o  <tytso@dcl>
 
 	* kadmin.exp: Use the principal "krbtest/admin@KRBTEST.COM" for
diff --git a/src/tests/dejagnu/krb-standalone/kadmin.exp b/src/tests/dejagnu/krb-standalone/kadmin.exp
index b9496a6b7..e48bbf244 100644
--- a/src/tests/dejagnu/krb-standalone/kadmin.exp
+++ b/src/tests/dejagnu/krb-standalone/kadmin.exp
@@ -69,7 +69,7 @@ proc kadmin_add { pname password } {
 	# use kdb5_edit to verify that a principal was created and that its
 	# salt types are 0 (normal).
 	#
-	spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	spawn $KDB5_EDIT -r KRBTEST.COM
 	expect_after { -i $spawn_id
 	    timeout {
 		fail "kadmin add $pname"
@@ -83,9 +83,6 @@ proc kadmin_add { pname password } {
 	    }
 	}
 	set good 0
-	expect -i $spawn_id "Enter KDC database master key" {
-	    send "masterkey$KEY\r"
-	}
 	expect "kdb5_edit:" { send "show $pname\r" }
 	expect {
 	    -re "Name: $pname@KRBTEST.COM\r\nKey version: 1\r\n.*Last modified by krbtest/admin@KRBTEST.COM.*Salt: 0.*Alt salt: 0" { 
@@ -157,7 +154,7 @@ proc kadmin_addv4 { pname password } {
 	# use kdb5_edit to verify that a principal was created and that its
 	# salt types are 1 (v4).
 	#
-	spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	spawn $KDB5_EDIT -r KRBTEST.COM
 	expect_after { -i $spawn_id
 	    timeout {
 		fail "kadmin addv4 $pname"
@@ -171,9 +168,6 @@ proc kadmin_addv4 { pname password } {
 	    }
 	}
 	set good 0
-	expect -i $spawn_id "Enter KDC database master key" {
-	    send "masterkey$KEY\r"
-	}
 	expect "kdb5_edit:" { send "show $pname\r" }
 	expect {
 	    -re "Name: $pname@KRBTEST.COM\r\nKey version: 1\r\n.*Last modified by krbtest/admin@KRBTEST.COM.*Salt: 1.*Alt salt: 1" { 
@@ -243,7 +237,7 @@ proc kadmin_add_rnd { pname } {
 	# use kdb5_edit to verify that a principal was created and that its
 	# salt types are 0 (normal).
 	#
-	spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	spawn $KDB5_EDIT -r KRBTEST.COM
 	expect_after { -i $spawn_id
 	    timeout {
 		fail "kadmin add_rnd $pname"
@@ -257,9 +251,6 @@ proc kadmin_add_rnd { pname } {
 	    }
 	}
 	set good 0
-	expect -i $spawn_id "Enter KDC database master key" {
-	    send "masterkey$KEY\r"
-	}
 	expect "kdb5_edit:" { send "show $pname\r" }
 	expect {
 	    -re "Name: $pname@KRBTEST.COM\r\nKey version: 1\r\n.*Last modified by krbtest/admin@KRBTEST.COM.*Salt: 0.*Alt salt: 0" { 
@@ -483,7 +474,7 @@ proc kadmin_rename { pname npname } {
 	# use kdb5_edit to verify that the new principal was created and that its
 	# salt types are 0 (normal).
 	#
-	spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	spawn $KDB5_EDIT -r KRBTEST.COM
 	expect_after { -i $spawn_id
 	    timeout {
 		fail "kadmin renent $pname $npname"
@@ -497,9 +488,6 @@ proc kadmin_rename { pname npname } {
 	    }
 	}
 	set good 0
-	expect -i $spawn_id "Enter KDC database master key" {
-	    send "masterkey$KEY\r"
-	}
 	expect "kdb5_edit:" { send "show $npname\r" }
 	expect {
 	    -re "Name: $npname@KRBTEST.COM\r\n.*Last modified by krbtest/admin@KRBTEST.COM.*Salt: 0.*Alt salt: 0" { 
@@ -517,7 +505,7 @@ proc kadmin_rename { pname npname } {
 	    #
 	    # use kdb5_edit to verify that the old principal is not present.
 	    #
-	    spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	    spawn $KDB5_EDIT -r KRBTEST.COM
 	    expect_after {
 		timeout {
 		    fail "kadmin renent $pname $npname"
@@ -531,7 +519,6 @@ proc kadmin_rename { pname npname } {
 		}
 	    }
 	    set good 0
-	    expect "Enter KDC database master key" { send "masterkey$KEY\r" }
 	    expect "kdb5_edit:" { send "show $pname\r" }
 	    expect "Principal $pname not found" { set good 1 }
 	    expect "kdb5_edit:" { send "q\r" }
@@ -715,7 +702,7 @@ proc kadmin_delete { pname } {
 	#
 	# use kdb5_edit to verify that the old principal is not present.
 	#
-	spawn $KDB5_EDIT -m -d $tmppwd/db -r KRBTEST.COM
+	spawn $KDB5_EDIT -r KRBTEST.COM
 	expect_after { -i $spawn_id
 	    timeout {
 		fail "kadmin delent $pname"
@@ -729,9 +716,6 @@ proc kadmin_delete { pname } {
 	    }
 	}
 	set good 0
-	expect -i $spawn_id "Enter KDC database master key" {
-	    send "masterkey$KEY\r"
-	}
 	expect "kdb5_edit:" { send "show $pname\r" }
 	expect "Principal $pname not found" { set good 1 }
 	expect "kdb5_edit:" { send "q\r" }