From d1bdfa0d738b406bb8dde22d7f058876bd37d05e Mon Sep 17 00:00:00 2001 From: John Kohl Date: Mon, 29 Apr 1991 13:09:02 +0000 Subject: [PATCH] fix some error messages & cases git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@2047 dc483132-0cff-0310-8789-dd5450dbe970 --- src/tests/verify/kdb5_verify.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tests/verify/kdb5_verify.c b/src/tests/verify/kdb5_verify.c index 0014ed867..707421c04 100644 --- a/src/tests/verify/kdb5_verify.c +++ b/src/tests/verify/kdb5_verify.c @@ -215,7 +215,7 @@ char *argv[]; } if (errors) - fprintf(stdout, "\n%d errors principals failed.\n", errors); + fprintf(stdout, "\n%d errors/principals failed.\n", errors); else fprintf(stdout, "\nNo errors.\n"); @@ -273,8 +273,9 @@ OLDDECLARG(char *, str_princ) } if (nprincs != 1) { - com_err(progname, 0, "Found more than one db entry for %s.\n", str_princ); - goto out; + com_err(progname, 0, "Found %d entries db entry for %s.\n", nprincs, + str_princ); + goto errout; } retval = krb5_kdb_decrypt_key(&master_encblock, @@ -282,10 +283,10 @@ OLDDECLARG(char *, str_princ) &db_key); if (retval) { com_err(progname, retval, "while decrypting key for '%s'", str_princ); - goto out; + goto errout; } - if ((pwd_key.keytype != db_key.keytype) | + if ((pwd_key.keytype != db_key.keytype) || (pwd_key.length != db_key.length)) { fprintf (stderr, "\tKey types do not agree (%d expected, %d from db)\n", pwd_key.keytype, db_key.keytype); -- 2.26.2