12 files changed, 584 insertions, 94 deletions

diff --git a/NEWS b/NEWS
index c96c0307..a875321b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Mailfromd NEWS -- history of user-visible changes. 2016-10-30
+Mailfromd NEWS -- history of user-visible changes. 2016-11-02
 Copyright (C) 2005-2016 Sergey Poznyakoff
 See the end of file for copying conditions.
 
@@ -7,14 +7,23 @@ Please send Mailfromd bug reports to <bug-mailfromd@gnu.org.ua>
 
 Version 7.99.97, (Git)
 
-This version is highly experimental and lacks documentation.
-Use `git log' for a detailed description of changes.
+This version is a major rewrite. Main changes:
 
 * Requires Mailutils 3.0
 
-* New utility mfdbtool
 * New daemon calloutd
 
+The calloutd utility is a stand-alone callout daemon.  It allows you
+to run sender address verification from a separate server.  See the
+section 'Milter and Callout servers' below, for a detailed explanation.
+
+* New utility mfdbtool
+
+In previous versions database management tasks were performed by
+mailfromd itself when it was called with appropriate options (--list,
+--delete, --expire).  Now these options are gone, and all database
+management tasks are carried out by a stand alone utility mfdbtool.
+
 * Changes to mailfromd configuration
 
 ** enable-vrfy
@@ -65,7 +74,7 @@ must be invoked with some additional option passed to mailfromd (say
 --no-user-conf), it can now be written as:
 
   #!/bin/sh
-  exec /usr/sbin/mailfromd --no-user-conf --run $0 $@
+  exec /usr/sbin/mailfromd --no-config --run $0 $@
   !#
   
   func main(...)
@@ -503,10 +512,9 @@ following sub-statement:
 When arg is `yes', this server is marked as the default callout server
 for all milter servers declared in the configuration.
 
-Alternatively, you may use a remote callout server, i.e. a separate
-instance of mailfromd, dedicated for that purpose.  In that case,
-the address of a callout server is declared using the `callout-url'
-statement:
+Alternatively, you may use a remote callout server run by a separate
+daemon 'calloutd'.  In that case, the URL of a callout server is
+declared using the `callout-url' statement:
 
   callout-url <url: string>;
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 9a9b6116..d97a2141 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -47,7 +47,7 @@ check-options: check-mailfromd-options check-calloutd-options check-mfdbtool-opt
 
 check-mailfromd-options:
         @$(CHECK_DOCS) "mailfromd options" \
-           '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           '/mu_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/mu_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
            's/@opindex *\([^@,]*\), --.*mailfromd option.*/\1/p' \
            $(top_srcdir)/src/main.c $(top_srcdir)/src/srvcfg.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
@@ -55,7 +55,7 @@ check-mailfromd-options:
 
 check-calloutd-options:
         @$(CHECK_DOCS) "calloutd options" \
-           '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/argp_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           '/mu_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg;/mu_option srv_options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
            's/@opindex *\([^@,]*\), --.*calloutd option.*/\1/p' \
            $(top_srcdir)/src/calloutd.c $(top_srcdir)/src/srvcfg.c  -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
@@ -63,7 +63,7 @@ check-calloutd-options:
 
 check-mfdbtool-options:
         @$(CHECK_DOCS) "mfdbtool options" \
-           '/argp_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
+           '/mu_option options\[\] = /,/^}/s/[ \t]*{ *"\([^,"]*\)".*/\1/pg' \
            's/@opindex *\([^@,]*\), --.*mfdbtool option.*/\1/p' \
            $(top_srcdir)/src/mfdbtool.c -- \
            $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \
diff --git a/doc/calloutd.texi b/doc/calloutd.texi
index 67597fe4..9e1c9ce2 100644
--- a/doc/calloutd.texi
+++ b/doc/calloutd.texi
@@ -5,9 +5,9 @@
 @pindex calloutd
   Usually callout verification is performed by a special instance of
 @command{mailfromd} (@pxref{callout server}).  However, it is also
-possible to set up callout server on a separate machine.  You can
-choose to do so, for instance, in order to reduce the load on the
-server running @command{mailfromd}.
+possible to set up a dedicated callout server on a separate machine.
+You can choose to do so, for instance, in order to reduce the load on
+the server running @command{mailfromd}.
 
   This stand-alone callout facility is provided by the
 @command{calloutd} daemon.
@@ -26,8 +26,249 @@ server running @command{mailfromd}.
 @section Calloutd Command-Line Options
 @WRITEME
 
+@subheading Server configuration modifiers
+@table @option
+@opsummary{foreground, calloutd}
+@item --foreground
+Stay in foreground.  When given this option, @command{calloutd} will
+not disconnect itself from the controlling terminal and will run in
+the foreground.
+
+@opsummary{group, calloutd}
+@item -g @var{name}
+@itemx --group=@var{name}
+
+Retain the group @var{name} when switching to user
+privileges.  @xref{Starting and Stopping}.
+
+@opsummary{pidfile, calloutd}
+@item --pidfile=@var{file}
+Set pidfile name.  Overrides the @code{pidfile} configuration
+statement, which you are advised to use instead (@pxref{conf-base, pidfile}).
+
+@opsummary{source-ip, calloutd}
+@item -S @var{ip}
+@itemx --source-ip=@var{ip}
+Set source address for @acronym{TCP} connections.  Overrides the
+@samp{source-ip} configuration statement, which you are advised to use
+instead (@pxref{conf-base, source-ip}). 
+
+@opsummary{single-process, calloutd}
+@item --single-process
+Do not fork sub-processes to serve requests.  This option is meant to
+assist in debugging @command{calloutd}.  Don't use it for anything
+else but for debugging, as it terribly degrades performance!
+
+@opsummary{state-directory, calloutd}
+@item --state-directory=@var{dir}
+Set new program state directory.  @xref{statedir, Local state directory}, for
+the description of this directory and its purposes.
+
+@opsummary{user, calloutd}
+@item -u @var{name}
+@itemx  --user @var{name}
+Switch to this user's privileges after startup.  Overrides the @code{user}
+configuration file statement, which you are advised to use instead
+(@pxref{conf-priv, user}).  Default user is
+@samp{@value{DEFAULT_USER}}.
+@end table
+
+@subheading Logging and debugging options
+@table @option
+@opsummary{debug, calloutd}
+@item -d @var{string}
+@itemx --debug=@var{string}
+Set debugging level.  @xref{Logging and Debugging}.
+
+@opsummary{log-facility, calloutd}
+@item --log-facility=@var{facility}
+Output logs to syslog @var{facility}.
+
+@opsummary{log-tag, calloutd}
+@item --log-tag=@var{string}
+Tag syslog entries with the given @var{string}, instead of the program name.
+
+@opsummary{logger, calloutd}
+@item --logger=@var{mech}
+Set logger mechanism (@var{mech} is one of @samp{stderr},
+@samp{syslog}, @samp{syslog:async}).  @xref{Logging and Debugging}.
+
+@opsummary{syslog, calloutd}
+@item --syslog
+Selects default syslog mechanism for diagnostic output.
+
+@opsummary{stderr, calloutd}
+@item --stderr
+Directs all logging to standard output.  Similar to @option{--logger=stderr}.
+
+@opsummary{source-ip, calloutd}
+@item -S @var{ip}
+@itemx --source-ip=@var{ip}
+Set source address for @acronym{TCP} connections.  Overrides the
+@samp{source-ip} configuration statement, which you are advised to use
+instead (@pxref{conf-base, source-ip}). 
+
+@opsummary{debug-level, calloutd}
+@item --debug-level=@var{level}
+Set Mailutils debugging level.  See
+@uref{http://mailutils.org/wiki/Debug_level}, for a detailed
+discussion of @var{level} argument.
+
+@opsummary{source-info, calloutd}
+@item --source-info
+@itemx --no-source-info
+Include @sc{c} source information in debugging messages.  This is
+similar to setting @code{line-info yes} in the @code{debug}
+configuration block (@FIXME-pxref{debug configuration}).
+
+The @option{--no-source-info} can be used to cancel the effect of the