diff options
| -rw-r--r-- | CHANGES | 9 | ||||
| -rwxr-xr-x | configure | 20 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/opt.c | 4 | ||||
| -rwxr-xr-x | src/test/test1.sh | 2 |
5 files changed, 24 insertions, 13 deletions
@@ -1,3 +1,12 @@ +2023-03-16 Jerry Lundström + + Release 2.11.2 + + Fixed long option argument handling (again), wasn't completely fixed + in v2.11.1. + + e6dbd78 Long opt + 2023-03-10 Jerry Lundström Release 2.11.1 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for dnsperf 2.11.1. +# Generated by GNU Autoconf 2.69 for dnsperf 2.11.2. # # Report bugs to <admin@dns-oarc.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='dnsperf' PACKAGE_TARNAME='dnsperf' -PACKAGE_VERSION='2.11.1' -PACKAGE_STRING='dnsperf 2.11.1' +PACKAGE_VERSION='2.11.2' +PACKAGE_STRING='dnsperf 2.11.2' PACKAGE_BUGREPORT='admin@dns-oarc.net' PACKAGE_URL='https://github.com/DNS-OARC/dnsperf/issues' @@ -1362,7 +1362,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures dnsperf 2.11.1 to adapt to many kinds of systems. +\`configure' configures dnsperf 2.11.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1433,7 +1433,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of dnsperf 2.11.1:";; + short | recursive ) echo "Configuration of dnsperf 2.11.2:";; esac cat <<\_ACEOF @@ -1572,7 +1572,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -dnsperf configure 2.11.1 +dnsperf configure 2.11.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1941,7 +1941,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by dnsperf $as_me 2.11.1, which was +It was created by dnsperf $as_me 2.11.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2804,7 +2804,7 @@ fi # Define the identity of the package. PACKAGE='dnsperf' - VERSION='2.11.1' + VERSION='2.11.2' cat >>confdefs.h <<_ACEOF @@ -14436,7 +14436,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by dnsperf $as_me 2.11.1, which was +This file was extended by dnsperf $as_me 2.11.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14503,7 +14503,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -dnsperf config.status 2.11.1 +dnsperf config.status 2.11.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 19458dc..b25c19f 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ # limitations under the License. AC_PREREQ(2.64) -AC_INIT([dnsperf], [2.11.1], [admin@dns-oarc.net], [dnsperf], [https://github.com/DNS-OARC/dnsperf/issues]) +AC_INIT([dnsperf], [2.11.2], [admin@dns-oarc.net], [dnsperf], [https://github.com/DNS-OARC/dnsperf/issues]) AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) AC_CONFIG_SRCDIR([src/dnsperf.c]) AC_CONFIG_HEADER([src/config.h]) @@ -239,9 +239,9 @@ static int perf_opt_long_parse(char* optarg) char* arg; if ((arg = strchr(optarg, '='))) { + optlen = arg - optarg; arg++; - optlen = strlen(arg); - if (optlen < 1) { + if (optlen < 1 || !strlen(arg)) { return -1; } } else { diff --git a/src/test/test1.sh b/src/test/test1.sh index a289c99..a2944d4 100755 --- a/src/test/test1.sh +++ b/src/test/test1.sh @@ -10,3 +10,5 @@ # test for broken long opt in v2.11.0 ../dnsperf -O suppress=test 2>&1 |grep -q "unknown message type to suppress: test" +# ...and in v2.11.1, issue #234 +../dnsperf -O doh-uri=https://blahblah.com/dns-query -O suppress=timeouts -h
\ No newline at end of file |