Index: ossp-pkg/lmtp2nntp/INSTALL
RCS File: /v/ossp/cvs/ossp-pkg/lmtp2nntp/INSTALL,v
rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/lmtp2nntp/INSTALL,v' 2>/dev/null
--- INSTALL	2001/10/09 10:19:12	1.8
+++ INSTALL	2001/10/11 09:35:39	1.9
@@ -31,18 +31,18 @@
   1. Create a "cf/mailer/lmtp2nntp.m4" macro file with the following contents:
 
      | PUSHDIVERT(-1)
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_PATH',         `/usr/local/bin/lmtp2nntp')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_FLAGS',        `mDFMuXz')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_ARGS',         `')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_BINDADDR',     '0.0.0.0')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_OPERATIONMODE',`post')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_GROUPMODE',    `envelope')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_MAILFROM',     `^.+@(?:[^.]+\.)+[^.]+$')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_NODENAME',     `confDOMAIN_NAME')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_SIZE',         `800000')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_LOGLEVEL',     `notice:/var/log/lmtp2nntp')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_WAITTIME',     `60')
-     | _DEFIFNOT(`LMTP2NNTP_MAILER_NEWSGROUP',    `\*')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_PATH',          `/usr/local/bin/lmtp2nntp')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_FLAGS',         `mDFMuXz')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_ARGS',          `')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_CLIENTBIND',    `0.0.0.0')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_GROUPMODE',     `envelope')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_LOGLEVEL',      `notice:/var/log/lmtp2nntp')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_MAILFROM',      `^.+@(?:[^.]+\.)+[^.]+$')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_NODENAME',      `confDOMAIN_NAME')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_OPERATIONMODE', `post')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_SIZE',          `800000')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_TIMEOUT',       `nntp:connect=60')
+     | _DEFIFNOT(`LMTP2NNTP_MAILER_NEWSGROUP',     `\*')
      | POPDIVERT
      |   
      | #########################################
@@ -53,19 +53,17 @@
      |             S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n,
      |             L=990, T=DNS/RFC822/SMTP, M=LMTP2NNTP_MAILER_MAX,
      |             A=lmtp2nntp LMTP2NNTP_MAILER_ARGS dnl
-     |                         -b LMTP2NNTP_MAILER_BINDADDR dnl
-     |                         -o LMTP2NNTP_MAILER_OPERATIONMODE dnl
+     |                         -c LMTP2NNTP_MAILER_CLIENTBIND dnl
+     |                         -d $h dnl
      |                         -g LMTP2NNTP_MAILER_GROUPMODE dnl
-     |                         -h $h dnl
+     |                         -l LMTP2NNTP_MAILER_LOGLEVEL dnl
      |                         -m LMTP2NNTP_MAILER_MAILFROM dnl
      |                         -n LMTP2NNTP_MAILER_NODENAME dnl
+     |                         -o LMTP2NNTP_MAILER_OPERATIONMODE dnl
      |                         -s LMTP2NNTP_MAILER_SIZE dnl
-     |                         -l LMTP2NNTP_MAILER_LOGLEVEL dnl
-     |                         -w LMTP2NNTP_MAILER_WAITTIME dnl
+     |                         -t LMTP2NNTP_MAILER_TIMEOUT dnl
      |                         LMTP2NNTP_MAILER_NEWSGROUP
 
-     FIXME
-
      This changes nothing in your Sendmail configuration, but just adds
      a new mailer named "lmtp2nntp" to Sendmail.