diff options
| author | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
|---|---|---|
| committer | Russ Allbery <rra@dropbox.com> | 2016-02-03 12:44:33 -0800 |
| commit | 2a53df4444cb8a931e82c584288025e315f40121 (patch) | |
| tree | 7c8b9bfa69cf613a22ba6be616a0d3fdb4146e4e /tests/tap/kerberos.h | |
| parent | 294d46a917b6aa3af305c3d50b8d83a1f3fb5694 (diff) | |
| parent | e64d4e31146b87046916c377557f8ea789da3f0a (diff) | |
Merge branch 'debian/master' into ubuntu/precise
Diffstat (limited to 'tests/tap/kerberos.h')
| -rw-r--r-- | tests/tap/kerberos.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/tap/kerberos.h b/tests/tap/kerberos.h index 8be0add..26f45f9 100644 --- a/tests/tap/kerberos.h +++ b/tests/tap/kerberos.h @@ -46,17 +46,21 @@ struct kerberos_config { char *username; /* The local (non-realm) part of principal. */ char *realm; /* The realm part of the principal. */ char *password; /* The password. */ + char *pkinit_principal; /* Principal for PKINIT authentication. */ + char *pkinit_cert; /* Path to certificates for PKINIT. */ }; /* * Whether to skip all tests (by calling skip_all) in kerberos_setup if - * certain configuration information isn't available. + * certain configuration information isn't available. "_BOTH" means that the + * tests require both keytab and password, but PKINIT is not required. */ enum kerberos_needs { TAP_KRB_NEEDS_NONE = 0x00, TAP_KRB_NEEDS_KEYTAB = 0x01, TAP_KRB_NEEDS_PASSWORD = 0x02, - TAP_KRB_NEEDS_BOTH = 0x01 | 0x02 + TAP_KRB_NEEDS_BOTH = 0x01 | 0x02, + TAP_KRB_NEEDS_PKINIT = 0x04 }; BEGIN_DECLS |