2344. [bug] Improve "logging{ file ...; };" documentation.

                        [RT #17888]

diff --git a/CHANGES b/CHANGES
index f4c858b00430fedf60ec63938d844ec2b2f5db64..b45408f630aa052bfa44dc6ac218c851250c7dd5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2344.  [bug]           Improve "logging{ file ...; };" documentation.
+                       [RT #17888]
+
 2343.  [bug]           (Seemingly) duplicate IPv6 entries could be
                        created in ADB. [RT #17837]
 

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index 65e30a2f3732ca929a15892028ee0bd62a86a36c..431f7a018c86a886e60c9ac101255defc65e683d 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: namedconf.c,v 1.30.18.38 2006/05/03 01:46:40 marka Exp $ */
+/* $Id: namedconf.c,v 1.30.18.39 2008/03/27 03:44:15 marka Exp $ */
 
 /*! \file */
 
@@ -1699,6 +1699,7 @@ static isc_result_t
 parse_logversions(cfg_parser_t *pctx, const cfg_type_t *type, cfg_obj_t **ret) {
        return (parse_enum_or_other(pctx, type, &cfg_type_uint32, ret));
 }
+
 static cfg_type_t cfg_type_logversions = {
        "logversions", parse_logversions, cfg_print_ustring, cfg_doc_terminal,
        &cfg_rep_string, logversions_enums
@@ -1772,8 +1773,19 @@ print_logfile(cfg_printer_t *pctx, const cfg_obj_t *obj) {
        }
 }
 
+
+static void
+doc_logfile(cfg_printer_t *pctx, const cfg_type_t *type) {
+       UNUSED(type);
+       cfg_print_cstr(pctx, "<quoted_string>");
+       cfg_print_chars(pctx, " ", 1);
+       cfg_print_cstr(pctx, "[ versions ( \"unlimited\" | <integer> ) ]");
+       cfg_print_chars(pctx, " ", 1);
+       cfg_print_cstr(pctx, "[ size <size> ]");
+}
+
 static cfg_type_t cfg_type_logfile = {
-       "log_file", parse_logfile, print_logfile, cfg_doc_terminal,
+       "log_file", parse_logfile, print_logfile, doc_logfile,
        &cfg_rep_tuple, logfile_fields
 };
 
@@ -1804,8 +1816,8 @@ static cfg_type_t cfg_type_lwres_view = {
 };
 
 static cfg_type_t cfg_type_lwres_searchlist = {
-       "lwres_searchlist", cfg_parse_bracketed_list, cfg_print_bracketed_list, cfg_doc_bracketed_list,
-       &cfg_rep_list, &cfg_type_astring };
+       "lwres_searchlist", cfg_parse_bracketed_list, cfg_print_bracketed_list,
+       cfg_doc_bracketed_list, &cfg_rep_list, &cfg_type_astring };
 
 static cfg_clausedef_t
 lwres_clauses[] = {
@@ -1924,15 +1936,15 @@ doc_sockaddrnameport(cfg_printer_t *pctx, const cfg_type_t *type) {
        cfg_print_chars(pctx, "( ", 2);
        cfg_print_cstr(pctx, "<quoted_string>");
        cfg_print_chars(pctx, " ", 1);
-       cfg_print_cstr(pctx, "[port <integer>]");
+       cfg_print_cstr(pctx, "[ port <integer> ]");
        cfg_print_chars(pctx, " | ", 3);
        cfg_print_cstr(pctx, "<ipv4_address>");
        cfg_print_chars(pctx, " ", 1);
-       cfg_print_cstr(pctx, "[port <integer>]");
+       cfg_print_cstr(pctx, "[ port <integer> ]");
        cfg_print_chars(pctx, " | ", 3);
        cfg_print_cstr(pctx, "<ipv6_address>");
        cfg_print_chars(pctx, " ", 1);
-       cfg_print_cstr(pctx, "[port <integer>]");
+       cfg_print_cstr(pctx, "[ port <integer> ]");
        cfg_print_chars(pctx, " )", 2);
 }
 
@@ -2010,11 +2022,11 @@ doc_masterselement(cfg_printer_t *pctx, const cfg_type_t *type) {
        cfg_print_chars(pctx, " | ", 3);
        cfg_print_cstr(pctx, "<ipv4_address>");
        cfg_print_chars(pctx, " ", 1);
-       cfg_print_cstr(pctx, "[port <integer>]");
+       cfg_print_cstr(pctx, "[ port <integer> ]");
        cfg_print_chars(pctx, " | ", 3);
        cfg_print_cstr(pctx, "<ipv6_address>");
        cfg_print_chars(pctx, " ", 1);
-       cfg_print_cstr(pctx, "[port <integer>]");
+       cfg_print_cstr(pctx, "[ port <integer> ]");
        cfg_print_chars(pctx, " )", 2);
 }