1356143Scydiff --git a/daemon/worker.c b/daemon/worker.c
2356143Scyindex 263fcdd..f787b70 100644
3356143Scy--- a/daemon/worker.c
4356143Scy+++ b/daemon/worker.c
5356143Scy@@ -1213,6 +1213,15 @@ worker_handle_request(struct comm_point* c, void* arg, int error,
6356143Scy 		addr_to_str(&repinfo->addr, repinfo->addrlen, ip, sizeof(ip));
7356143Scy 		log_query_in(ip, qinfo.qname, qinfo.qtype, qinfo.qclass);
8356143Scy 	}
9356143Scy+
10356143Scy+	if(worker->env.cfg->drop_tld) {
11356143Scy+		int lab = dname_count_labels(qinfo.qname);
12356143Scy+		if (lab == 2) {
13356143Scy+			comm_point_drop_reply(repinfo);
14356143Scy+			verbose(VERB_ALGO, "Dropping one label query.");
15356143Scy+			return 0;
16356143Scy+		}
17356143Scy+	}
18356143Scy 	if(qinfo.qtype == LDNS_RR_TYPE_AXFR || 
19356143Scy 		qinfo.qtype == LDNS_RR_TYPE_IXFR) {
20356143Scy 		verbose(VERB_ALGO, "worker request: refused zone transfer.");
21356143Scydiff --git a/util/config_file.h b/util/config_file.h
22356143Scyindex b3ef930..2791541 100644
23356143Scy--- a/util/config_file.h
24356143Scy+++ b/util/config_file.h
25356143Scy@@ -274,6 +274,8 @@ struct config_file {
26356143Scy 	int prefetch_key;
27356143Scy 	/** deny queries of type ANY with an empty answer */
28356143Scy 	int deny_any;
29356143Scy+	/** Drop TLD queries from clients **/
30356143Scy+	int drop_tld;
31356143Scy 
32356143Scy 	/** chrootdir, if not "" or chroot will be done */
33356143Scy 	char* chrootdir;
34356143Scydiff --git a/util/configlexer.lex b/util/configlexer.lex
35356143Scyindex a86ddf5..9bbedbb 100644
36356143Scy--- a/util/configlexer.lex
37356143Scy+++ b/util/configlexer.lex
38356143Scy@@ -299,6 +299,7 @@ private-domain{COLON}		{ YDVAR(1, VAR_PRIVATE_DOMAIN) }
39356143Scy prefetch-key{COLON}		{ YDVAR(1, VAR_PREFETCH_KEY) }
40356143Scy prefetch{COLON}			{ YDVAR(1, VAR_PREFETCH) }
41356143Scy deny-any{COLON}			{ YDVAR(1, VAR_DENY_ANY) }
42356143Scy+drop-tld{COLON}			{ YDVAR(1, VAR_DROP_TLD) }
43356143Scy stub-zone{COLON}		{ YDVAR(0, VAR_STUB_ZONE) }
44356143Scy name{COLON}			{ YDVAR(1, VAR_NAME) }
45356143Scy stub-addr{COLON}		{ YDVAR(1, VAR_STUB_ADDR) }
46356143Scydiff --git a/util/configparser.y b/util/configparser.y
47356143Scyindex 10227a2..567d68e 100644
48356143Scy--- a/util/configparser.y
49356143Scy+++ b/util/configparser.y
50356143Scy@@ -164,6 +164,7 @@ extern struct config_parser_state* cfg_parser;
51356143Scy %token VAR_FAST_SERVER_PERMIL VAR_FAST_SERVER_NUM
52356143Scy %token VAR_ALLOW_NOTIFY VAR_TLS_WIN_CERT VAR_TCP_CONNECTION_LIMIT
53356143Scy %token VAR_FORWARD_NO_CACHE VAR_STUB_NO_CACHE VAR_LOG_SERVFAIL VAR_DENY_ANY
54356143Scy+%token VAR_DROP_TLD
55356143Scy %token VAR_UNKNOWN_SERVER_TIME_LIMIT VAR_LOG_TAG_QUERYREPLY
56356143Scy %token VAR_STREAM_WAIT_SIZE VAR_TLS_CIPHERS VAR_TLS_CIPHERSUITES
57356143Scy %token VAR_TLS_SESSION_TICKET_KEYS
58356143Scy@@ -266,6 +267,7 @@ content_server: server_num_threads | server_verbosity | server_port |
59356143Scy 	server_tls_cert_bundle | server_tls_additional_port | server_low_rtt |
60356143Scy 	server_fast_server_permil | server_fast_server_num  | server_tls_win_cert |
61356143Scy 	server_tcp_connection_limit | server_log_servfail | server_deny_any |
62356143Scy+	server_drop_tld |
63356143Scy 	server_unknown_server_time_limit | server_log_tag_queryreply |
64356143Scy 	server_stream_wait_size | server_tls_ciphers |
65356143Scy 	server_tls_ciphersuites | server_tls_session_ticket_keys
66356143Scy@@ -1466,6 +1468,16 @@ server_deny_any: VAR_DENY_ANY STRING_ARG
67356143Scy 		free($2);
68356143Scy 	}
69356143Scy 	;
70356143Scy+
71356143Scy+server_drop_tld: VAR_DROP_TLD STRING_ARG
72356143Scy+	{
73356143Scy+		OUTYY(("P(server_drop_tld:%s)\n", $2));
74356143Scy+		if(strcmp($2, "yes") != 0 && strcmp($2, "no") != 0)
75356143Scy+			yyerror("expected yes or no.");
76356143Scy+		else cfg_parser->cfg->drop_tld = (strcmp($2, "yes")==0);
77356143Scy+		free($2);
78356143Scy+	}
79356143Scy+	;
80356143Scy server_unwanted_reply_threshold: VAR_UNWANTED_REPLY_THRESHOLD STRING_ARG
81356143Scy 	{
82356143Scy 		OUTYY(("P(server_unwanted_reply_threshold:%s)\n", $2));
83