Florian Obser(flor...@openbsd.org) on 2017.02.17 19:20:41 +0000:
> ... and in case you want to see what's actually going on,
> this is without the _t conversion churn:
thanks, and ok (for the one with the type stuff)
> commit 4cfab5a8d90abb380ae6a64da825883a2f360dc1
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 15:04:08 2017 +0100
>
> log at verbosity 3.
>
> diff --git nsec3.c nsec3.c
> index f24377d4259..960e7216dad 100644
> --- nsec3.c
> +++ nsec3.c
> @@ -855,7 +855,7 @@ nsec3_add_nonexist_proof(struct query* query, struct
> answer* answer,
> {
> /* exact match, hash collision */
> /* the hashed name of the query corresponds to an existing
> name. */
> - VERBOSITY(2, (LOG_ERR, "nsec3 hash collision for name=%s",
> + VERBOSITY(3, (LOG_ERR, "nsec3 hash collision for name=%s",
> dname_to_string(to_prove, NULL)));
> RCODE_SET(query->packet, RCODE_SERVFAIL);
> return;
> commit da0c808f5fd4a3a6d75083e57ff83125409cf63f
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 15:03:27 2017 +0100
>
> Fix that nsec3 hash collisions only reported on
> verbosity level 2.
>
> diff --git nsec3.c nsec3.c
> index cbbc560feab..f24377d4259 100644
> --- nsec3.c
> +++ nsec3.c
> @@ -855,8 +855,8 @@ nsec3_add_nonexist_proof(struct query* query, struct
> answer* answer,
> {
> /* exact match, hash collision */
> /* the hashed name of the query corresponds to an existing
> name. */
> - log_msg(LOG_ERR, "nsec3 hash collision for name=%s",
> - dname_to_string(to_prove, NULL));
> + VERBOSITY(2, (LOG_ERR, "nsec3 hash collision for name=%s",
> + dname_to_string(to_prove, NULL)));
> RCODE_SET(query->packet, RCODE_SERVFAIL);
> return;
> }
> commit e704b0278dff9418494b01ad18e0aca6fcd041af
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 15:02:59 2017 +0100
>
> layout
>
> diff --git rbtree.h rbtree.h
> index 19330eac195..d6e54862a23 100644
> --- rbtree.h
> +++ rbtree.h
> @@ -19,11 +19,11 @@
> */
> typedef struct rbnode rbnode_type;
> struct rbnode {
> - rbnode_type *parent;
> - rbnode_type *left;
> - rbnode_type *right;
> - const void *key;
> - uint8_t color;
> + rbnode_type *parent;
> + rbnode_type *left;
> + rbnode_type *right;
> + const void *key;
> + uint8_t color;
> };
>
> #define RBTREE_NULL &rbtree_null_node
> commit 86df8159cf9786a73d4f38384aae02b9ddc0dfa9
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 15:00:34 2017 +0100
>
> Fix #1195: Fix so that NSD fails on non-compliant values for Serial
>
> diff --git util.c util.c
> index db3d7ceddce..458f0946643 100644
> --- util.c
> +++ util.c
> @@ -487,6 +487,10 @@ strtoserial(const char* nptr, const char** endptr)
> case '7':
> case '8':
> case '9':
> + if((i*10)/10 != i)
> + /* number too large, return i
> + * with *endptr != 0 as a failure*/
> + return i;
> i *= 10;
> i += (**endptr - '0');
> break;
> commit 504de18c0f56c4e3b117d6c268b6ca0e7a508d9b
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 15:00:08 2017 +0100
>
> Squelch zone transfer error address family not supported by protocol
> at low verbosity levels.
>
> diff --git xfrd-tcp.c xfrd-tcp.c
> index 506b2520589..bd9d64e6397 100644
> --- xfrd-tcp.c
> +++ xfrd-tcp.c
> @@ -521,7 +521,10 @@ xfrd_tcp_open(xfrd_tcp_set_t* set, struct
> xfrd_tcp_pipeline* tp,
> }
> fd = socket(family, SOCK_STREAM, IPPROTO_TCP);
> if(fd == -1) {
> - log_msg(LOG_ERR, "xfrd: %s cannot create tcp socket: %s",
> + /* squelch 'Address family not supported by protocol' at low
> + * verbosity levels */
> + if(errno != EAFNOSUPPORT || verbosity > 2)
> + log_msg(LOG_ERR, "xfrd: %s cannot create tcp socket: %s",
> zone->master->ip_address_spec, strerror(errno));
> xfrd_set_refresh_now(zone);
> return 0;
> commit 5c1a096cdf30ff6ea39317d733dcfbc431b137d9
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 14:59:29 2017 +0100
>
> Fix nsd-control and ipv6 only.
>
> diff --git nsd-control.c nsd-control.c
> index 0b482839b47..1cc54e8f4c2 100644
> --- nsd-control.c
> +++ nsd-control.c
> @@ -156,9 +156,13 @@ contact_server(const char* svr, nsd_options_t* cfg, int
> statuscmd)
> int port = cfg->control_port;
> /* use svr or a config entry */
> if(!svr) {
> - if(cfg->control_interface)
> + if(cfg->control_interface) {
> svr = cfg->control_interface->address;
> - else svr = "127.0.0.1";
> + } else if(cfg->do_ip4) {
> + svr = "127.0.0.1";
> + } else {
> + svr = "::1";
> + }
> /* config 0 addr (everything), means ask localhost */
> if(strcmp(svr, "0.0.0.0") == 0)
> svr = "127.0.0.1";
> commit 911b921ea0ca1cbf37f4acb239de495960dc4814
> Author: Florian Obser <flor...@narrans.de>
> Date: Fri Feb 17 14:58:35 2017 +0100
>
> tag 4.1.14 - trunk contains 4.1.15 in development.
>
> diff --git configure.ac configure.ac
> index 029193574f0..b984cac435a 100644
> --- configure.ac
> +++ configure.ac
> @@ -4,7 +4,7 @@ dnl
>
> sinclude(acx_nlnetlabs.m4)
>
> -AC_INIT(NSD,4.1.14,nsd-b...@nlnetlabs.nl)
> +AC_INIT(NSD,4.1.15,nsd-b...@nlnetlabs.nl)
> AC_CONFIG_HEADER([config.h])
>
> CFLAGS="$CFLAGS"
>
>
> --
> I'm not entirely sure you are real.
>
