INN commit: branches/2.5 (samples/inn.conf.in tests/lib/innconf-t.c)

[INN Commit]

    Date: Saturday, October 10, 2009 @ 01:00:19
  Author: iulius
Revision: 8660

* Mention --enable-keywords and --with-openssl in the default
inn.conf configuration file.

* No need to regenerate the overview when the keyword generation
code is used.

Modified:
  branches/2.5/samples/inn.conf.in
  branches/2.5/tests/lib/innconf-t.c

-----------------------+
 samples/inn.conf.in   |   11 +++++++----
 tests/lib/innconf-t.c |    2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

Modified: samples/inn.conf.in
===================================================================
--- samples/inn.conf.in	2009-10-10 07:59:50 UTC (rev 8659)
+++ samples/inn.conf.in	2009-10-10 08:00:19 UTC (rev 8660)
@@ -95,9 +95,9 @@
 
 # Reading -- Keyword Support
 #
-# Enabling this without stopping innd and deleting the existing overview
-# database and adding will probably confuse a lot of things.  You must
-# have compiled this support in too.
+# You should add "keywords" to extraoverviewadvertised or extraoverviewhidden
+# if you enable this feature.  You must have compiled this support in too
+# with --enable-keywords at configure time.
 
 keywords:               false
 keyartlimit:            100000
@@ -128,7 +128,10 @@
 backoffpostslow:        1
 backofftrigger:         10000
 
-# Reading and posting -- TLS/SSL support
+# Reading and Posting -- TLS/SSL Support
+#
+# You must have compiled this support in with --with-openssl
+# at configure time.
 
 #tlscafile:
 #tlscapath:             @sysconfdir@

Modified: tests/lib/innconf-t.c
===================================================================
--- tests/lib/innconf-t.c	2009-10-10 07:59:50 UTC (rev 8659)
+++ tests/lib/innconf-t.c	2009-10-10 08:00:19 UTC (rev 8660)
@@ -56,7 +56,7 @@
     fclose(config);
     ok(7, !innconf_check("config/tmp"));
     unlink("config/tmp");
-    ok_string(8, "config/tmp:36: unknown parameter foo\n", errors);
+    ok_string(8, "config/tmp:37: unknown parameter foo\n", errors);
     errors_uncapture();
     free(errors);
     errors = NULL;