diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-07-29 16:20:46 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-07-29 16:20:46 -0700 |
| commit | 0c72d75380464dca85749b10244969241863ecf6 (patch) | |
| tree | 9a6da58996d91d3bf0a665c03e79246f045f0c8b /tests/client | |
| parent | 5017e47ac6feffbbb5cf0d8f2541a7bb044e6255 (diff) | |
Update client test to work correctly with Heimdal userspace
The check for whether we got the right keytab data was not being done
on Heimdal since it only knew how to run klist. Add a new ktutil_list
function to kerberos.sh that runs klist or ktutil list as appropriate.
Diffstat (limited to 'tests/client')
| -rw-r--r-- | tests/client/basic-t.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/client/basic-t.in b/tests/client/basic-t.in index 86e24d5..11f0bce 100644 --- a/tests/client/basic-t.in +++ b/tests/client/basic-t.in @@ -114,10 +114,10 @@ rm -f srvtab srvtab.bak # Test keytab merging. ok_program 'keytab merging' 0 '' \ "$wallet" -f keytab get keytab service/fake-keytab -(klist -keK keytab 2>&1) | sed '/Keytab name:/d' > klist-seen -(klist -keK data/fake-keytab-merge 2>&1) | sed '/Keytab name:/d' > klist-good +ktutil_list keytab klist-seen +ktutil_list data/fake-keytab-merge klist-good ok '...and the merged keytab is correct' cmp klist-seen klist-good -rm -f keytab klist-seen klist-good +rm -f keytab klist-good klist-seen # Test srvtab download into a merged keytab with an older version. cp data/fake-keytab-old keytab |