diff options
| author | Russ Allbery <rra@stanford.edu> | 2010-08-25 18:01:37 -0700 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2010-08-25 18:01:37 -0700 |
| commit | 5cc66fdef38a67e25850159c0c5282d6dc927178 (patch) | |
| tree | 9636351ee75eacc2f74a989fd8fad712fe95e6ec /tests/client/basic-t.in | |
| parent | d46528a011f58881af9e9fb0c11de6422d469f17 (diff) | |
| parent | e91c0b93355b28617f7c0d756026856762ece242 (diff) | |
Merge commit 'upstream/0.12' into debian
Diffstat (limited to 'tests/client/basic-t.in')
| -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 |