diff options
| author | Russ Allbery <eagle@eyrie.org> | 2018-05-27 20:59:59 -0700 |
|---|---|---|
| committer | Russ Allbery <eagle@eyrie.org> | 2018-05-27 20:59:59 -0700 |
| commit | bdcb3741db27d6b773ce7cdf05aab063a70ea100 (patch) | |
| tree | 11e11bb646e0b58db6e23b59e3c856ea59ef3545 /client/options.c | |
| parent | 62a9101895a2d596bf91231f119d338d2025ff08 (diff) | |
Update to rra-c-util 7.2 and C TAP Harness 4.3
Update to rra-c-util 7.2:
* Improve configure output for krb5-config testing.
* Define UINT32_MAX for systems that don't have it.
* Add SPDX-License-Identifier headers to all substantial source files.
* Fix new warnings from GCC 7 and Clang warnings.
* Require Test::Strict 0.25 or later to run those tests.
* Fix off-by-one error in return-value checks for snprintf.
* Use Autoconf to probe for supported warning flags.
* Fix running module-version-t -u with current versions of Perl.
* Use C_TAP_SOURCE and C_TAP_BUILD instead of SOURCE and BUILD.
Update to C TAP Harness 4.3:
* Add support for valgrind and libtool in test lists.
* Report test failures as left and right, not wanted and expected.
* Fix string comparisons with NULL pointers and the string "(null)".
* Add SPDX-License-Identifier headers to all substantial source files.
* Avoid zero-length realloc allocations in breallocarray.
* Fix new warnings from GCC 7 and Clang warnings.
* Use C_TAP_SOURCE and C_TAP_BUILD instead of SOURCE and BUILD.
Diffstat (limited to 'client/options.c')
| -rw-r--r-- | client/options.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/client/options.c b/client/options.c index ae88485..3c68cc7 100644 --- a/client/options.c +++ b/client/options.c @@ -5,7 +5,8 @@ * file for both wallet and wallet-rekey. * * Written by Russ Allbery <eagle@eyrie.org> - * Copyright 2006, 2007, 2008, 2010 + * Copyright 2018 Russ Allbery <eagle@eyrie.org> + * Copyright 2006-2008, 2010 * The Board of Trustees of the Leland Stanford Junior University * * See LICENSE for licensing terms. @@ -63,9 +64,15 @@ default_number(krb5_context ctx, const char *opt, int defval, int *result) void default_options(krb5_context ctx, struct options *options) { + int port; + default_string(ctx, "wallet_type", "wallet", &options->type); default_string(ctx, "wallet_server", WALLET_SERVER, &options->server); default_string(ctx, "wallet_principal", NULL, &options->principal); - default_number(ctx, "wallet_port", WALLET_PORT, &options->port); + default_number(ctx, "wallet_port", WALLET_PORT, &port); + if (port <= 0 || port > 65535) + options->port = WALLET_PORT; + else + options->port = (unsigned short) port; options->user = NULL; } |