diff options
| author | Russ Allbery <eagle@eyrie.org> | 2020-05-17 17:05:30 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2020-05-17 17:05:30 -0700 |
| commit | c138111a3c27863308b6552a5527a9e821a3dc11 (patch) | |
| tree | fe3c16462bf0213708f20d251a63e5b9bbf2d23f /tests/tap/kerberos.h | |
| parent | ccfbd34d597318215b979338c4cb5d7e4a3f0d6f (diff) | |
Update to rra-c-util 8.2 and C TAP Harness 4.7
Update to rra-c-util 8.2:
* Implement explicit_bzero with memset if it is not available.
* Reformat all C source using clang-format 10.
* Work around Test::Strict not skipping .git directories.
* Fix warnings with perltidy 20190601 and Perl::Critic 1.134.
* Fix warnings with Clang 10, GCC 10, and the Clang static analyzer.
Update to C TAP Harness 4.7:
* Fix warnings with GCC 10.
* Reformat all C source using clang-format 10.
* Fixed malloc error checking in bstrndup.
Diffstat (limited to 'tests/tap/kerberos.h')
| -rw-r--r-- | tests/tap/kerberos.h | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/tests/tap/kerberos.h b/tests/tap/kerberos.h index c256822..0664905 100644 --- a/tests/tap/kerberos.h +++ b/tests/tap/kerberos.h @@ -5,7 +5,7 @@ * which can be found at <https://www.eyrie.org/~eagle/software/rra-c-util/>. * * Written by Russ Allbery <eagle@eyrie.org> - * Copyright 2017 Russ Allbery <eagle@eyrie.org> + * Copyright 2017, 2020 Russ Allbery <eagle@eyrie.org> * Copyright 2006-2007, 2009, 2011-2014 * The Board of Trustees of the Leland Stanford Junior University * @@ -37,20 +37,20 @@ #include <tests/tap/macros.h> #ifdef HAVE_KRB5 -# include <portable/krb5.h> +# include <portable/krb5.h> #endif /* Holds the information parsed from the Kerberos test configuration. */ struct kerberos_config { - char *keytab; /* Path to the keytab. */ - char *principal; /* Principal whose keys are in the keytab. */ - char *cache; /* Path to the Kerberos ticket cache. */ - char *userprinc; /* The fully-qualified principal. */ - 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. */ + char *keytab; /* Path to the keytab. */ + char *principal; /* Principal whose keys are in the keytab. */ + char *cache; /* Path to the Kerberos ticket cache. */ + char *userprinc; /* The fully-qualified principal. */ + 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. */ }; /* @@ -59,11 +59,13 @@ struct kerberos_config { * tests require both keytab and password, but PKINIT is not required. */ enum kerberos_needs { + /* clang-format off */ TAP_KRB_NEEDS_NONE = 0x00, TAP_KRB_NEEDS_KEYTAB = 0x01, TAP_KRB_NEEDS_PASSWORD = 0x02, TAP_KRB_NEEDS_BOTH = 0x01 | 0x02, TAP_KRB_NEEDS_PKINIT = 0x04 + /* clang-format on */ }; BEGIN_DECLS @@ -106,7 +108,7 @@ void kerberos_cleanup(void); void kerberos_generate_conf(const char *realm); void kerberos_cleanup_conf(void); -/* Thes interfaces are only available with native Kerberos support. */ +/* These interfaces are only available with native Kerberos support. */ #ifdef HAVE_KRB5 /* Bail out with an error, appending the Kerberos error message. */ |