- Fix #1206: Some view-related commands are missing from 'unbound-control -h'

git-svn-id: file:///svn/unbound/trunk@3986 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/doc/Changelog b/doc/Changelog
index f7e21f93da323827393092f87bd3a5d445e82fcf..e6c5768ecedd5661640e25b5646a23dbda8f919c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,6 @@
 12 January 2017: Wouter
        - Fix to also block meta types 128 through to 248 with formerr. 
+       - Fix #1206: Some view-related commands are missing from 'unbound-control -h'
 
 9 January 2017: Wouter
        - Fix #1202: Fix code comment that packed_rrset_data is not always

diff --git a/doc/unbound-control.8.in b/doc/unbound-control.8.in
index a2e5f6079070d5443a2844a85eee1c332064f673..d275d887bc88c293bc2ea8d96290e2f0d27a2089 100644 (file)
--- a/doc/unbound-control.8.in
+++ b/doc/unbound-control.8.in
@@ -295,6 +295,9 @@ ips are dropped before checking the cache.
 .B view_local_zone_remove \fIview\fR \fIname
 \fIlocal_zone_remove\fR for given view.
 .TP
+.B view_list_local_data \fIview\fR
+\fIlist_local_data\fR for given view.
+.TP
 .B view_local_data \fIview\fR \fIRR data...
 \fIlocal_data\fR for given view.
 .TP

diff --git a/smallapp/unbound-control.c b/smallapp/unbound-control.c
index 470b796e5198664b11181b4849c09acda5178d84..70e5cdc23f0667649df27154d3bbbb5c67b45096 100644 (file)
--- a/smallapp/unbound-control.c
+++ b/smallapp/unbound-control.c
@@ -126,6 +126,12 @@ usage(void)
        printf("  ratelimit_list [+a]           list ratelimited domains\n");
        printf("  ip_ratelimit_list [+a]        list ratelimited ip addresses\n");
        printf("                +a              list all, also not ratelimited\n");
+       printf("  view_list_local_zones view    list local-zones in view\n");
+       printf("  view_list_local_data  view    list local-data RRs in view\n");
+       printf("  view_local_zone view name type        add local-zone in view\n");
+       printf("  view_local_zone_remove view name      remove local-zone in view\n");
+       printf("  view_local_data view RR..             add local-data in view\n");
+       printf("  view_local_data_remove view name      remove local-data in view\n");
        printf("Version %s\n", PACKAGE_VERSION);
        printf("BSD licensed, see LICENSE in source package for details.\n");
        printf("Report bugs to %s\n", PACKAGE_BUGREPORT);