summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/kadmin/passwd/unit-test/kpasswd.0/principal.exp43
1 files changed, 35 insertions, 8 deletions
diff --git a/src/kadmin/passwd/unit-test/kpasswd.0/principal.exp b/src/kadmin/passwd/unit-test/kpasswd.0/principal.exp
index 9cfff69f6..01b2296fc 100644
--- a/src/kadmin/passwd/unit-test/kpasswd.0/principal.exp
+++ b/src/kadmin/passwd/unit-test/kpasswd.0/principal.exp
@@ -15,8 +15,21 @@ if [info exist env(DEBUG)] { debug 1 }
if {[info exists env(KRB5CCNAME)]} {
unset env(KRB5CCNAME)
}
+
+# Apple (in Mac OS X 10.5.4) is shipping a tcl in which
+# unsetting env-array values seems not to work!
+if {[info exists env(KRB5CCNAME)]} {
+ untested {B.7: default nonexisting ccache(1) (unset failed, tcl defective!)}
+ untested {B.7: default nonexisting ccache(2)}
+ untested {B.4: default existing cache containing existing principal}
+ set test2pass test2
+
+} else {
+
+
kdestroy
+
#### no principal specified
if {[info exists env(USER)]} {
@@ -25,21 +38,33 @@ if {[info exists env(USER)]} {
set whoami [exec whoami]
}
-test_win {} {B.7: default nonexisting ccache(1)} $whoami $whoami newpass
-test_win {} {B.7: default nonexisting ccache(2)} $whoami newpass $whoami
+ test_win {} {B.7: default nonexisting ccache(1)} $whoami $whoami newpass
+ test_win {} {B.7: default nonexisting ccache(2)} $whoami newpass $whoami
-kinit test2 test2
-test_win {} {B.4: default existing cache containing existing principal} \
- test2 test2 newpass
-kdestroy
+ kinit test2 test2
+ test_win {} {B.4: default existing cache containing existing principal} \
+ test2 test2 newpass
+ kdestroy
+ set test2pass newpass
+}
set env(KRB5CCNAME) FILE:/tmp/ovsec_adm_test_ccache
-kinit test2 newpass
+kinit test2 $test2pass
test_win {} {B.3: specified existing cache containing existing principal} \
- test2 newpass test2
+ test2 $test2pass test2
kdestroy
unset env(KRB5CCNAME)
+# Apple (in Mac OS X 10.5.4) is shipping a tcl in which
+# unsetting env-array values seems not to work!
+if {[info exists env(KRB5CCNAME)]} {
+ untested {B.14: existing principal, no realm}
+ untested {B.15, C.6: non-existent principal, no realm}
+ untested {B.16: existing principal, with realm}
+ untested {B.17: non-existent principal, with realm}
+
+} else {
+
#### principal on command line
#
@@ -58,3 +83,5 @@ test_initerr {bogus@SECURE-TEST.OV.COM} \
{B.17: non-existent principal, with realm} \
bogus bogus \
3 "${initerr_str}Client not found in Kerberos database"
+
+}