From 1f9424ccf2e992a6baf93ff74577dd7f4a56b6a7 Mon Sep 17 00:00:00 2001
From: Sara Dickinson <sara@sinodun.com>
Date: Tue, 5 Jan 2016 09:25:49 +0000
Subject: [PATCH] Fix output of get_api_settings functions

---
 src/context.c           | 20 ++++++++++++++------
 src/test/getdns_query.c |  3 ++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/context.c b/src/context.c
index 95ff1b63..e3f76dd3 100644
--- a/src/context.c
+++ b/src/context.c
@@ -2922,6 +2922,7 @@ _get_context_settings(getdns_context* context)
     }
     /* int fields */
     r = getdns_dict_set_int(result, "timeout", context->timeout);
+    r = getdns_dict_set_int(result, "idle_timeout", context->idle_timeout);
     r |= getdns_dict_set_int(result, "limit_outstanding_queries", context->limit_outstanding_queries);
     r |= getdns_dict_set_int(result, "dnssec_allowed_skew", context->dnssec_allowed_skew);
     r |= getdns_dict_set_int(result, "follow_redirects", context->follow_redirects);
@@ -3392,15 +3393,22 @@ getdns_context_get_upstream_recursive_servers(getdns_context *context,
 				break;
 
 			if (upstream->transport == GETDNS_TRANSPORT_TLS) {
-				if (upstream_port(upstream) == getdns_port_array[j])
-					(void) getdns_dict_set_int(d, "tls_port",
-								   (uint32_t) upstream_port(upstream));
+				if (upstream_port(upstream) != getdns_port_array[j] &&
+					(r = getdns_dict_set_int(d, "tls_port",
+								   (uint32_t) upstream_port(upstream))))
+					break;
+				if (upstream->tls_auth_name[0] != '\0' &&
+				    (r = getdns_dict_util_set_string(d,
+				                                     "tls_auth_name",
+				                                     upstream->tls_auth_name)))
+					break;
 				if (upstream->tls_pubkey_pinset) {
 					getdns_list *pins = NULL;
-					if (_getdns_get_pubkey_pinset_list(context,
+					if ((_getdns_get_pubkey_pinset_list(context,
 									   upstream->tls_pubkey_pinset,
-									   &pins) == GETDNS_RETURN_GOOD)
-						(void) getdns_dict_set_list(d, "tls_pubkey_pinset", pins);
+									   &pins) == GETDNS_RETURN_GOOD) &&
+						(r = getdns_dict_set_list(d, "tls_pubkey_pinset", pins)))
+						break;
 					getdns_list_destroy(pins);
 				}
 			}
diff --git a/src/test/getdns_query.c b/src/test/getdns_query.c
index a2fdc71c..8a39cf58 100644
--- a/src/test/getdns_query.c
+++ b/src/test/getdns_query.c
@@ -458,6 +458,7 @@ print_usage(FILE *out, const char *progname)
 {
 	fprintf(out, "usage: %s [<option> ...] \\\n"
 	    "\t\t[@<upstream> ...] [+<extension> ...] [<name>] [<type>]\n", progname);
+	fprintf(out, "\ndefault mode: recursive, synchronous resolution of NS record using UDP with TCP fallback\n");
 	fprintf(out, "\nupstreams: @<ip>[%%<scope_id>][@<port>][#<tls port>][~<tls name>][^<tsig spec>]\n");
 	fprintf(out, "\ntsig spec: [<algorithm>:]<name>:<secret in Base64>\n");
 	fprintf(out, "\nextensions:\n");
@@ -519,7 +520,7 @@ print_usage(FILE *out, const char *progname)
 	fprintf(out, "\t-O\tSet transport to TCP only keep connections open\n");
 	fprintf(out, "\t-L\tSet transport to TLS only keep connections open\n");
 	fprintf(out, "\t-E\tSet transport to TLS with TCP fallback only keep connections open\n");
-	fprintf(out, "\t-u\tSet transport to UDP with TCP fallback\n");
+	fprintf(out, "\t-u\tSet transport to UDP with TCP fallback (default)\n");
 	fprintf(out, "\t-U\tSet transport to UDP only\n");
 	fprintf(out, "\t-l <transports>\tSet transport list. List can contain 1 of each of the characters\n");
 	fprintf(out, "\t\t\t U T L S for UDP, TCP or TLS e.g 'UT' or 'LTU' \n");