diff options
| author | Russ Allbery <eagle@eyrie.org> | 2014-01-05 10:13:04 -0800 |
|---|---|---|
| committer | Russ Allbery <rra@stanford.edu> | 2014-01-05 12:59:47 -0800 |
| commit | fd54b5d2e4c709e081edd0901d754967067280fe (patch) | |
| tree | e1c3a0975feda91501f75fea6dbce2fac75b8548 /client | |
| parent | 008c9b1956fa2d6ad35ecd0c5251288232cab88b (diff) | |
Update to rra-c-util 5.1 and C TAP Harness 2.4
Update to rra-c-util 5.1:
* Suppress a dummy symbol in the client library that could leak.
* Don't attempt to use Kerberos if no Kerberos error APIs were found.
* Improve error handling in xasprintf and xvasprintf.
* Check the return status of snprintf and vsnprintf properly.
* Preserve errno if snprintf fails in vasprintf replacement.
* Improve error handling of network_bind_* functions.
* vector_free and cvector_free now can be passed NULL.
* Abort remctl tests if the PID file already exists.
Update to C TAP Harness 2.4:
* Suppress lazy plans and test summaries if the test failed with bail.
Change-Id: I024db40536ff5e20f53bc8d1b346723be05543bc
Reviewed-on: https://gerrit.stanford.edu/1354
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>
Diffstat (limited to 'client')
| -rw-r--r-- | client/api.c | 8 | ||||
| -rw-r--r-- | client/internal.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/client/api.c b/client/api.c index 2f32930..d98b19b 100644 --- a/client/api.c +++ b/client/api.c @@ -11,8 +11,8 @@ * * Written by Russ Allbery <eagle@eyrie.org> * Based on work by Anton Ushakov - * Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013 - * The Board of Trustees of the Leland Stanford Junior University + * Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012, 2013, + * 2014 The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ @@ -224,7 +224,7 @@ remctl_new(void) r->context = GSS_C_NO_CONTEXT; r->error = NULL; r->output = NULL; -#ifdef HAVE_KERBEROS +#ifdef HAVE_KRB5 r->krb_ctx = NULL; r->krb_ccache = NULL; #endif @@ -248,7 +248,7 @@ remctl_new(void) * this will be per-context. Otherwise, be aware that this function sets the * Kerberos credential cache globally for all uses of GSS-API by that process. */ -#if defined(HAVE_KERBEROS) && defined(HAVE_GSS_KRB5_IMPORT_CRED) +#if defined(HAVE_KRB5) && defined(HAVE_GSS_KRB5_IMPORT_CRED) int remctl_set_ccache(struct remctl *r, const char *ccache) { diff --git a/client/internal.h b/client/internal.h index c49e736..ab77f78 100644 --- a/client/internal.h +++ b/client/internal.h @@ -3,8 +3,8 @@ * * Written by Russ Allbery <eagle@eyrie.org> * Based on prior work by Anton Ushakov - * Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 - * The Board of Trustees of the Leland Stanford Junior University + * Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013, + * 2014 The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. */ @@ -40,7 +40,7 @@ struct remctl { bool ready; /* If true, we are expecting server output. */ /* Used to hold state for remctl_set_ccache. */ -#ifdef HAVE_KERBEROS +#ifdef HAVE_KRB5 krb5_context krb_ctx; krb5_ccache krb_ccache; #endif @@ -55,7 +55,7 @@ BEGIN_DECLS void internal_set_error(struct remctl *, const char *, ...); void internal_gssapi_error(struct remctl *, const char *error, OM_uint32 major, OM_uint32 minor); -#ifdef HAVE_KERBEROS +#ifdef HAVE_KRB5 void internal_krb5_error(struct remctl *, const char *error, krb5_error_code code); #endif |