* default.exp (passes): Add an AES-only pass.

(start_kerberos_daemons): Check for error "No principal in keytab matches
desired name".
(dump_db): New proc, for debugging.
(spawn_xterm): Add GSSCLIENT to list of exported variables.

ticket: 2066
status: open

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

diff --git a/src/tests/dejagnu/config/ChangeLog b/src/tests/dejagnu/config/ChangeLog
index beabe48b8fce692c863e3e0cbe1574aae1ad221c..9396e5eb9037d8ebbc84160f39f0f2318498b12f 100644 (file)
--- a/src/tests/dejagnu/config/ChangeLog
+++ b/src/tests/dejagnu/config/ChangeLog
@@ -1,3 +1,11 @@
+2003-12-13  Ken Raeburn  <raeburn@mit.edu>
+
+       * default.exp (passes): Add an AES-only pass.
+       (start_kerberos_daemons): Check for error "No principal in keytab
+       matches desired name".
+       (dump_db): New proc, for debugging.
+       (spawn_xterm): Add GSSCLIENT to list of exported variables.
+
 2003-06-05  Ken Raeburn  <raeburn@mit.edu>
 
        * default.exp (setup_root_shell): Check for "not authorized".  Map

diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp
index 5f4b5924d8d09580614b9ae96d8add0fa5977042..215671d340633e219d3333224e143cd27621cc7d 100644 (file)
--- a/src/tests/dejagnu/config/default.exp
+++ b/src/tests/dejagnu/config/default.exp
@@ -96,6 +96,17 @@ set passes {
        {master_key_type=aes256-cts-hmac-sha1-96}
        {dummy=[verbose -log "AES + DES enctypes"]}
     }
+    {
+       aesonly
+       des3_krbtgt=0
+       {supported_enctypes=aes256-cts-hmac-sha1-96:normal}
+       {kdc_supported_enctypes=aes256-cts-hmac-sha1-96:normal}
+       {permitted_enctypes(kdc)=aes256-cts-hmac-sha1-96}
+       {permitted_enctypes(client)=aes256-cts-hmac-sha1-96}
+       {permitted_enctypes(server)=aes256-cts-hmac-sha1-96}
+       {master_key_type=aes256-cts-hmac-sha1-96}
+       {dummy=[verbose -log "AES enctypes"]}
+    }
     {
        aes-des3
        des3_krbtgt=0
@@ -1451,6 +1462,10 @@ proc start_kerberos_daemons { standalone } {
            wait -i $tailf_spawn_id
            return 0
        }
+       "No principal in keytab matches desired name" {
+           dump_db
+           exp_continue
+       }
        "starting" { }
        timeout {
            if {$standalone} {
@@ -1591,6 +1606,28 @@ proc add_kerberos_key { kkey standalone } {
     }
 }
 
+# dump_db
+proc dump_db { } {
+    global KADMIN_LOCAL
+    global REALMNAME
+
+    spawn $KADMIN_LOCAL -r $REALMNAME
+    expect_after {
+       eof {
+           perror "failed to get debugging dump of database (eof)"
+       }
+       timeout {
+           perror "failed to get debugging dump of database (timeout)"
+       }
+    }
+    expect "kadmin.local: "
+    send "getprincs\r"
+    expect "kadmin.local: "
+    send "quit\r"
+    expect eof
+    catch expect_after
+}
+
 # add_random_key
 # Add a key with a random password to the Kerberos database.
 # start_kerberos_daemons must be called before this procedure.  If the
@@ -2508,7 +2545,7 @@ proc krb_exit { } {
 # helpful sometimes for debugging the test suite
 proc spawn_xterm { } {
     global env
-    foreach i {KDB5_UTIL KRB5KDC KADMIND KADMIN KADMIN_LOCAL KINIT KTUTIL KLIST RLOGIN RLOGIND FTP FTPD KPASSWD REALMNAME} {
+    foreach i {KDB5_UTIL KRB5KDC KADMIND KADMIN KADMIN_LOCAL KINIT KTUTIL KLIST RLOGIN RLOGIND FTP FTPD KPASSWD REALMNAME GSSCLIENT} {
        global $i
        if [info exists $i] { set env($i) [set $i] }
     }