#define KRB5_OK 0
-#define CHECK(kret,msg) \
- if (kret != KRB5_OK) { \
+#define CHECK_ERR(kret,err,msg) \
+ if (kret != err) { \
com_err(msg, kret, ""); \
fflush(stderr); \
exit(1); \
} else if(debug) printf("%s went ok\n", msg);
+#define CHECK(kret,msg) CHECK_ERR(kret, 0, msg)
#define CHECK_STR(str,msg) \
if (str == 0) { \
fprintf(stderr, "Testing miscellaneous error conditions\n");
kret = krb5_kt_resolve(context, "unknown_method_ep:/tmp/name", &ktid);
- if (kret != KRB5_KT_UNKNOWN_TYPE) {
- CHECK(kret, "resolve unknown type");
- }
+ CHECK_ERR(kret, KRB5_KT_UNKNOWN_TYPE, "resolve unknown type");
/* Test length limits on krb5_kt_default_name */
kret = krb5_kt_default_name(context, defname, sizeof(defname));
}
kret = krb5_kt_default_name(context, name, strlen(defname));
free(name);
- if (kret != KRB5_CONFIG_NOTENUFSPACE) {
- CHECK(kret, "krb5_kt_default_name limited");
- }
+ CHECK_ERR(kret, KRB5_CONFIG_NOTENUFSPACE, "krb5_kt_default_name limited");
}
static void
*/
p = malloc(strlen(buf));
kret = krb5_kt_get_name(context, kt, p, 1);
- if(kret != KRB5_KT_NAME_TOOLONG) {
- CHECK(kret, "get_name - size 1");
- }
+ CHECK_ERR(kret, KRB5_KT_NAME_TOOLONG, "get_name - size 1");
kret = krb5_kt_get_name(context, kt, p, strlen(buf));
- if(kret != KRB5_KT_NAME_TOOLONG) {
- CHECK(kret, "get_name");
- }
+ CHECK_ERR(kret, KRB5_KT_NAME_TOOLONG, "get_name");
free(p);
/* Try to lookup unknown principal - when keytab does not exist*/
kret = krb5_parse_name(context, "test/test2@TEST.MIT.EDU", &princ);
CHECK(kret, "parsing principal");
-
+ /* This will return ENOENT for FILE because the file doesn't exist,
+ * so accept that or KRB5_KT_NOTFOUND. */
kret = krb5_kt_get_entry(context, kt, princ, 0, 0, &kent);
- if((kret != KRB5_KT_NOTFOUND) && (kret != ENOENT)) {
- CHECK(kret, "Getting non-existant entry");
+ if (kret != ENOENT) {
+ CHECK_ERR(kret, KRB5_KT_NOTFOUND, "Getting non-existent entry");
}
+ kret = krb5_kt_have_content(context, kt);
+ CHECK_ERR(kret, KRB5_KT_NOTFOUND, "Checking for keytab content (empty)");
+
/* =================== Add entries to keytab ================= */
/*
/* ============== Test iterating over contents of keytab ========= */
+ kret = krb5_kt_have_content(context, kt);
+ CHECK(kret, "Checking for keytab content (full)");
+
kret = krb5_kt_start_seq_get(context, kt, &cursor);
CHECK(kret, "Start sequence get");
cnt++;
krb5_free_keytab_entry_contents(context, &kent);
}
- if (kret != KRB5_KT_END) {
- CHECK(kret, "getting next entry");
- }
+ CHECK_ERR(kret, KRB5_KT_END, "getting next entry");
if(cnt != 3) {
fprintf(stderr, "Mismatch in number of entries in keytab");
kret = krb5_kt_get_entry(context, kt, princ, 0, 0, &kent);
- if((kret != KRB5_KT_NOTFOUND)) {
- CHECK(kret, "Getting non-existant entry");
- }
+ CHECK_ERR(kret, KRB5_KT_NOTFOUND, "Getting non-existant entry");
krb5_free_principal(context, princ);
/* Try to lookup specified enctype and kvno - that does not exist*/
kret = krb5_kt_get_entry(context, kt, princ, 3, 1, &kent);
- if(kret != KRB5_KT_KVNONOTFOUND) {
- CHECK(kret, "looking up specific principal, kvno, enctype");
- }
+ CHECK_ERR(kret, KRB5_KT_KVNONOTFOUND,
+ "looking up specific principal, kvno, enctype");
krb5_free_principal(context, princ);
/* All keytab types are registered by default -- test for
redundant error */
kret = krb5_kt_register(context, &krb5_ktf_writable_ops);
- if(kret && kret != KRB5_KT_TYPE_EXISTS) {
- CHECK(kret, "register ktf_writable");
- }
+ CHECK_ERR(kret, KRB5_KT_TYPE_EXISTS, "register ktf_writable");
test_misc(context);
do_test(context, "WRFILE:", FALSE);