Re: Change to mailer.conf(5) man page

2018-09-16 Thread Matt Schwartz
Yes, the comment should go as it is superfluous. Let me know if you
decide you want the BUGS section after all and I will re-do the patch.
On Sun, Sep 16, 2018 at 5:44 PM Jason McIntyre  wrote:
>
> On Sun, Sep 16, 2018 at 12:25:47PM +0200, Sebastian Benoit wrote:
> > Jason McIntyre(j...@kerhand.co.uk) on 2018.09.16 07:17:24 +0100:
> > > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote:
> > > > Damnit! I forgot one line. Please disregard the previous. Now all
> > > > lines of mailer.conf(5) should reflect that sendmail is no longer in
> > > > the default install.
> > > >
> > >
> > > i'm ok with this, though the spacing on your diff got mangled and it
> > > doesn;t apply.
> > >
> > > i'd be tempted to remove the text ", named 
> > > /usr/local/libexec/sendmail/sendmail"
> > >
> > > anyone want to ok (or commit with my ok)?
> >
> > ok benno@
> >
> > possible further improvements:
> >
> > * maybe we should mention that sendmail is a package that needs tobe
> > installed? I dont know if we do that in manpages usually?
> >
>
> i thought about changing the comment (Execute the real sendmail...) from
> naming the path to naming the package, but i don;t like it. i still want
> to trim that comment, since speciying that path, then relisting it 5
> times seems unneccessary.
>
> we could add some (separate) text about adding sendmail as a package. i'm not 
> sure
> if that would be helpful or not.
>
> > * the BUGS section can go away i think, its wishfull thinking because
> > these program names are the defacto standard.
> >
>
> i'm ok with removing that idea, but the man point of the entry seems to
> be that having a need for this file is a bug in itself. shouldn;t we retain 
> the removal
> of this system as a goal?
>
> jmc
>
> >
> > > jmc
> > >
> > > > Index: mailer.conf.5
> > > > ===
> > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
> > > > retrieving revision 1.17
> > > > diff -u -p -u -r1.17 mailer.conf.5
> > > > --- mailer.conf.5   8 Dec 2015 09:06:32 -   1.17
> > > > +++ mailer.conf.5   16 Sep 2018 01:41:53 -
> > > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra
> > > >  MTA suite in place of
> > > >  .Xr smtpd 8 .
> > > >  .Bd -literal
> > > > -# Execute the "real" sendmail program, named 
> > > > /usr/libexec/sendmail/sendmail
> > > > -sendmail   /usr/libexec/sendmail/sendmail
> > > > -send-mail  /usr/libexec/sendmail/sendmail
> > > > -mailq  /usr/libexec/sendmail/sendmail
> > > > -makemap/usr/libexec/sendmail/makemap
> > > > -newaliases /usr/libexec/sendmail/sendmail
> > > > -hoststat   /usr/libexec/sendmail/sendmail
> > > > -purgestat  /usr/libexec/sendmail/sendmail
> > > > +# Execute the "real" sendmail program, named
> > > > /usr/local/libexec/sendmail/sendmail
> > > > +sendmail   /usr/local/libexec/sendmail/sendmail
> > > > +send-mail  /usr/local/libexec/sendmail/sendmail
> > > > +mailq  /usr/local/libexec/sendmail/sendmail
> > > > +makemap/usr/local/libexec/sendmail/makemap
> > > > +newaliases /usr/local/libexec/sendmail/sendmail
> > > > +hoststat   /usr/local/libexec/sendmail/sendmail
> > > > +purgestat  /usr/local/libexec/sendmail/sendmail
> > > >  .Ed
> > > >  .Sh SEE ALSO
> > > >  .Xr mail 1 ,
> > > >
> > > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz 
> > > >  wrote:
> > > > >
> > > > > Quick correction to the mailer.conf(5) man page. Since sendmail is no
> > > > > longer in the default install, the man page has been corrected to
> > > > > reflect that the sendmail binary would be in
> > > > > /usr/local/libexec/sendmail instead of /usr/libexec/sendmail.
> > > > >
> > > > > Index: mailer.conf.5
> > > > > ===
> > > > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
> > > > > retrieving revision 1.17
> > > > > diff -u -p -u -r1.17 mailer.conf.5
> > > > > --- mailer.conf.5   8 Dec 2015 09:06:32 -   

Re: Change to mailer.conf(5) man page

2018-09-16 Thread Matt Schwartz
I am not sure how the patch got mangled but below reflects the
suggested changes - sorry for the noise. BUGS section removed and I
made a note to install sendmail via ports.

Index: mailer.conf.5
===
RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
retrieving revision 1.17
diff -u -p -u -r1.17 mailer.conf.5
--- mailer.conf.58 Dec 2015 09:06:32 -1.17
+++ mailer.conf.516 Sep 2018 12:06:45 -
@@ -76,16 +76,18 @@ newaliases/usr/sbin/smtpctl
 This example shows how to invoke the traditional
 .Xr sendmail 8
 MTA suite in place of
-.Xr smtpd 8 .
+.Xr smtpd 8 . You will need to install sendmail from ports since it
+is no longer in base.
 .Bd -literal
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-sendmail/usr/libexec/sendmail/sendmail
-send-mail/usr/libexec/sendmail/sendmail
-mailq/usr/libexec/sendmail/sendmail
-makemap /usr/libexec/sendmail/makemap
-newaliases/usr/libexec/sendmail/sendmail
-hoststat/usr/libexec/sendmail/sendmail
-purgestat/usr/libexec/sendmail/sendmail
+# Execute the real sendmail program located in
+# /usr/local/libexec/sendmail/sendmail
+sendmail/usr/local/libexec/sendmail/sendmail
+send-mail/usr/local/libexec/sendmail/sendmail
+mailq/usr/local/libexec/sendmail/sendmail
+makemap /usr/local/libexec/sendmail/makemap
+newaliases/usr/local//sendmail/sendmail
+hoststat/usr/local/sendmail/sendmail
+purgestat/usr/local/sendmail/sendmail
 .Ed
 .Sh SEE ALSO
 .Xr mail 1 ,
@@ -95,10 +97,3 @@ purgestat/usr/libexec/sendmail/sendmail
 .Xr smtpd 8
 .Sh AUTHORS
 .An Perry E. Metzger Aq Mt pe...@piermont.com
-.Sh BUGS
-The entire reason this program exists is a crock.
-Instead, a command for how to submit mail should be standardized,
-and all the "behave differently if invoked with a different name"
-behavior of things like
-.Xr mailq 8
-should go away.

On Sun, Sep 16, 2018 at 6:28 AM Sebastian Benoit  wrote:
>
> Jason McIntyre(j...@kerhand.co.uk) on 2018.09.16 07:17:24 +0100:
> > On Sat, Sep 15, 2018 at 09:42:47PM -0400, Matt Schwartz wrote:
> > > Damnit! I forgot one line. Please disregard the previous. Now all
> > > lines of mailer.conf(5) should reflect that sendmail is no longer in
> > > the default install.
> > >
> >
> > i'm ok with this, though the spacing on your diff got mangled and it
> > doesn;t apply.
> >
> > i'd be tempted to remove the text ", named 
> > /usr/local/libexec/sendmail/sendmail"
> >
> > anyone want to ok (or commit with my ok)?
>
> ok benno@
>
> possible further improvements:
>
> * maybe we should mention that sendmail is a package that needs tobe
> installed? I dont know if we do that in manpages usually?
>
> * the BUGS section can go away i think, its wishfull thinking because
> these program names are the defacto standard.
>
>
> > jmc
> >
> > > Index: mailer.conf.5
> > > ===
> > > RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
> > > retrieving revision 1.17
> > > diff -u -p -u -r1.17 mailer.conf.5
> > > --- mailer.conf.5   8 Dec 2015 09:06:32 -   1.17
> > > +++ mailer.conf.5   16 Sep 2018 01:41:53 -
> > > @@ -78,14 +78,14 @@ This example shows how to invoke the tra
> > >  MTA suite in place of
> > >  .Xr smtpd 8 .
> > >  .Bd -literal
> > > -# Execute the "real" sendmail program, named 
> > > /usr/libexec/sendmail/sendmail
> > > -sendmail   /usr/libexec/sendmail/sendmail
> > > -send-mail  /usr/libexec/sendmail/sendmail
> > > -mailq  /usr/libexec/sendmail/sendmail
> > > -makemap/usr/libexec/sendmail/makemap
> > > -newaliases /usr/libexec/sendmail/sendmail
> > > -hoststat   /usr/libexec/sendmail/sendmail
> > > -purgestat  /usr/libexec/sendmail/sendmail
> > > +# Execute the "real" sendmail program, named
> > > /usr/local/libexec/sendmail/sendmail
> > > +sendmail   /usr/local/libexec/sendmail/sendmail
> > > +send-mail  /usr/local/libexec/sendmail/sendmail
> > > +mailq  /usr/local/libexec/sendmail/sendmail
> > > +makemap/usr/local/libexec/sendmail/makemap
> > > +newaliases /usr/local/libexec/sendmail/sendmail
> > > +hoststat   /usr/local/libexec/sendmail/sendmail
> > > +purgestat  /usr/local/libexec/sendmail/sendmail
> > >  .Ed
> > >  .Sh SEE ALSO
> > >  .Xr mail 1 ,
> > >
> > > On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz wrote:
&

Re: Change to mailer.conf(5) man page

2018-09-15 Thread Matt Schwartz
Damnit! I forgot one line. Please disregard the previous. Now all
lines of mailer.conf(5) should reflect that sendmail is no longer in
the default install.

Index: mailer.conf.5
===
RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
retrieving revision 1.17
diff -u -p -u -r1.17 mailer.conf.5
--- mailer.conf.5   8 Dec 2015 09:06:32 -   1.17
+++ mailer.conf.5   16 Sep 2018 01:41:53 -
@@ -78,14 +78,14 @@ This example shows how to invoke the tra
 MTA suite in place of
 .Xr smtpd 8 .
 .Bd -literal
-# Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-sendmail   /usr/libexec/sendmail/sendmail
-send-mail  /usr/libexec/sendmail/sendmail
-mailq  /usr/libexec/sendmail/sendmail
-makemap/usr/libexec/sendmail/makemap
-newaliases /usr/libexec/sendmail/sendmail
-hoststat   /usr/libexec/sendmail/sendmail
-purgestat  /usr/libexec/sendmail/sendmail
+# Execute the "real" sendmail program, named
/usr/local/libexec/sendmail/sendmail
+sendmail   /usr/local/libexec/sendmail/sendmail
+send-mail  /usr/local/libexec/sendmail/sendmail
+mailq  /usr/local/libexec/sendmail/sendmail
+makemap/usr/local/libexec/sendmail/makemap
+newaliases /usr/local/libexec/sendmail/sendmail
+hoststat   /usr/local/libexec/sendmail/sendmail
+purgestat  /usr/local/libexec/sendmail/sendmail
 .Ed
 .Sh SEE ALSO
 .Xr mail 1 ,

On Sat, Sep 15, 2018 at 9:36 PM Matt Schwartz  wrote:
>
> Quick correction to the mailer.conf(5) man page. Since sendmail is no
> longer in the default install, the man page has been corrected to
> reflect that the sendmail binary would be in
> /usr/local/libexec/sendmail instead of /usr/libexec/sendmail.
>
> Index: mailer.conf.5
> ===
> RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
> retrieving revision 1.17
> diff -u -p -u -r1.17 mailer.conf.5
> --- mailer.conf.5   8 Dec 2015 09:06:32 -   1.17
> +++ mailer.conf.5   16 Sep 2018 01:34:31 -
> @@ -79,13 +79,13 @@ MTA suite in place of
>  .Xr smtpd 8 .
>  .Bd -literal
>  # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
> -sendmail   /usr/libexec/sendmail/sendmail
> -send-mail  /usr/libexec/sendmail/sendmail
> -mailq  /usr/libexec/sendmail/sendmail
> -makemap/usr/libexec/sendmail/makemap
> -newaliases /usr/libexec/sendmail/sendmail
> -hoststat   /usr/libexec/sendmail/sendmail
> -purgestat  /usr/libexec/sendmail/sendmail
> +sendmail   /usr/local/libexec/sendmail/sendmail
> +send-mail  /usr/local/libexec/sendmail/sendmail
> +mailq  /usr/local/libexec/sendmail/sendmail
> +makemap/usr/local/libexec/sendmail/makemap
> +newaliases /usr/local/libexec/sendmail/sendmail
> +hoststat   /usr/local/libexec/sendmail/sendmail
> +purgestat  /usr/local/libexec/sendmail/sendmail
>  .Ed
>  .Sh SEE ALSO
>  .Xr mail 1 ,



Change to mailer.conf(5) man page

2018-09-15 Thread Matt Schwartz
Quick correction to the mailer.conf(5) man page. Since sendmail is no
longer in the default install, the man page has been corrected to
reflect that the sendmail binary would be in
/usr/local/libexec/sendmail instead of /usr/libexec/sendmail.

Index: mailer.conf.5
===
RCS file: /cvs/src/usr.sbin/mailwrapper/mailer.conf.5,v
retrieving revision 1.17
diff -u -p -u -r1.17 mailer.conf.5
--- mailer.conf.5   8 Dec 2015 09:06:32 -   1.17
+++ mailer.conf.5   16 Sep 2018 01:34:31 -
@@ -79,13 +79,13 @@ MTA suite in place of
 .Xr smtpd 8 .
 .Bd -literal
 # Execute the "real" sendmail program, named /usr/libexec/sendmail/sendmail
-sendmail   /usr/libexec/sendmail/sendmail
-send-mail  /usr/libexec/sendmail/sendmail
-mailq  /usr/libexec/sendmail/sendmail
-makemap/usr/libexec/sendmail/makemap
-newaliases /usr/libexec/sendmail/sendmail
-hoststat   /usr/libexec/sendmail/sendmail
-purgestat  /usr/libexec/sendmail/sendmail
+sendmail   /usr/local/libexec/sendmail/sendmail
+send-mail  /usr/local/libexec/sendmail/sendmail
+mailq  /usr/local/libexec/sendmail/sendmail
+makemap/usr/local/libexec/sendmail/makemap
+newaliases /usr/local/libexec/sendmail/sendmail
+hoststat   /usr/local/libexec/sendmail/sendmail
+purgestat  /usr/local/libexec/sendmail/sendmail
 .Ed
 .Sh SEE ALSO
 .Xr mail 1 ,



Re: Update to table(5) man page

2018-09-05 Thread Matt Schwartz
I will make those changes you want as soon as I can get to my computer.

On Wed, Sep 5, 2018, 6:23 AM Matt Schwartz 
wrote:

> Thanks guys. I really like working on documentation. Please let me know if
> I can help on anything in the future.
>
> On Wed, Sep 5, 2018, 3:22 AM Jason McIntyre  wrote:
>
>> On Tue, Sep 04, 2018 at 08:54:37AM -0400, Matt Schwartz wrote:
>> > Below is a diff to clear up the description of the Userinfo table in
>> > table(5). I also added an example of how it can be used with an Alias
>> > table.
>> >
>> > Thanks,
>> > Matt
>> >
>>
>> fixed now. thanks,
>> jmc
>>
>> > Index: table.5
>> > ===
>> > RCS file: /cvs/src/usr.sbin/smtpd/table.5,v
>> > retrieving revision 1.9
>> > diff -u -p -u -r1.9 table.5
>> > --- table.524 May 2018 20:40:21 -1.9
>> > +++ table.54 Sep 2018 12:52:47 -
>> > @@ -174,16 +174,12 @@ ipv6:::1
>> >  192.168.1.0/24
>> >  .Ed
>> >  .Ss Userinfo tables
>> > -User info tables are used to described virtual system users.
>> > -They are used in rule context to specify an alternate user base,
>> mapping
>> > -virtual users to local system UID, GID and home directory.
>> > +User info tables are used in rule context to specify an alternate user
>> base,
>> > +mapping virtual users to local system users by UID, GID and home
>> directory.
>> >  .Pp
>> >  .D1 Ic action Ar name method Cm userbase Pf < Ar table Ns >
>> >  .Pp
>> > -The userinfo table is a mapping from virtual user names to a set of
>> system user
>> > -ID, group ID and path to home directory.
>> > -.Pp
>> > -A userinfo table looks as follows:
>> > +An userinfo table looks as follows:
>> >  .Bd -literal -offset indent
>> >  joe1000:100:/home/virtual/joe
>> >  jack1000:100:/home/virtual/jack
>> > @@ -193,7 +189,15 @@ In this example, both joe and jack are v
>> >  system user with UID 1000 and GID 100, but different home directories.
>> >  These directories may contain a
>> >  .Xr forward 5
>> > -file.
>> > +file. This can be used in conjunction with an
>> > +.Cm Alias table
>> > +that maps an email address or the domain part to the desired virtual
>> > +username. For example:
>> > +.Bd -literal -offset indent
>> > +j...@example.orgjoe
>> > +j...@example.comjack
>> > +.Ed
>> > +.Pp
>> >  .Ss Source tables
>> >  Source tables are lists of IPv4 and IPv6 addresses.
>> >  They can only be used in the following context:
>> >
>>
>>


Re: Update to table(5) man page

2018-09-05 Thread Matt Schwartz
Thanks guys. I really like working on documentation. Please let me know if
I can help on anything in the future.

On Wed, Sep 5, 2018, 3:22 AM Jason McIntyre  wrote:

> On Tue, Sep 04, 2018 at 08:54:37AM -0400, Matt Schwartz wrote:
> > Below is a diff to clear up the description of the Userinfo table in
> > table(5). I also added an example of how it can be used with an Alias
> > table.
> >
> > Thanks,
> > Matt
> >
>
> fixed now. thanks,
> jmc
>
> > Index: table.5
> > ===
> > RCS file: /cvs/src/usr.sbin/smtpd/table.5,v
> > retrieving revision 1.9
> > diff -u -p -u -r1.9 table.5
> > --- table.524 May 2018 20:40:21 -1.9
> > +++ table.54 Sep 2018 12:52:47 -
> > @@ -174,16 +174,12 @@ ipv6:::1
> >  192.168.1.0/24
> >  .Ed
> >  .Ss Userinfo tables
> > -User info tables are used to described virtual system users.
> > -They are used in rule context to specify an alternate user base, mapping
> > -virtual users to local system UID, GID and home directory.
> > +User info tables are used in rule context to specify an alternate user
> base,
> > +mapping virtual users to local system users by UID, GID and home
> directory.
> >  .Pp
> >  .D1 Ic action Ar name method Cm userbase Pf < Ar table Ns >
> >  .Pp
> > -The userinfo table is a mapping from virtual user names to a set of
> system user
> > -ID, group ID and path to home directory.
> > -.Pp
> > -A userinfo table looks as follows:
> > +An userinfo table looks as follows:
> >  .Bd -literal -offset indent
> >  joe1000:100:/home/virtual/joe
> >  jack1000:100:/home/virtual/jack
> > @@ -193,7 +189,15 @@ In this example, both joe and jack are v
> >  system user with UID 1000 and GID 100, but different home directories.
> >  These directories may contain a
> >  .Xr forward 5
> > -file.
> > +file. This can be used in conjunction with an
> > +.Cm Alias table
> > +that maps an email address or the domain part to the desired virtual
> > +username. For example:
> > +.Bd -literal -offset indent
> > +j...@example.orgjoe
> > +j...@example.comjack
> > +.Ed
> > +.Pp
> >  .Ss Source tables
> >  Source tables are lists of IPv4 and IPv6 addresses.
> >  They can only be used in the following context:
> >
>
>


Update to table(5) man page

2018-09-04 Thread Matt Schwartz
Below is a diff to clear up the description of the Userinfo table in
table(5). I also added an example of how it can be used with an Alias
table.

Thanks,
Matt

Index: table.5
===
RCS file: /cvs/src/usr.sbin/smtpd/table.5,v
retrieving revision 1.9
diff -u -p -u -r1.9 table.5
--- table.524 May 2018 20:40:21 -1.9
+++ table.54 Sep 2018 12:52:47 -
@@ -174,16 +174,12 @@ ipv6:::1
 192.168.1.0/24
 .Ed
 .Ss Userinfo tables
-User info tables are used to described virtual system users.
-They are used in rule context to specify an alternate user base, mapping
-virtual users to local system UID, GID and home directory.
+User info tables are used in rule context to specify an alternate user base,
+mapping virtual users to local system users by UID, GID and home directory.
 .Pp
 .D1 Ic action Ar name method Cm userbase Pf < Ar table Ns >
 .Pp
-The userinfo table is a mapping from virtual user names to a set of system user
-ID, group ID and path to home directory.
-.Pp
-A userinfo table looks as follows:
+An userinfo table looks as follows:
 .Bd -literal -offset indent
 joe1000:100:/home/virtual/joe
 jack1000:100:/home/virtual/jack
@@ -193,7 +189,15 @@ In this example, both joe and jack are v
 system user with UID 1000 and GID 100, but different home directories.
 These directories may contain a
 .Xr forward 5
-file.
+file. This can be used in conjunction with an
+.Cm Alias table
+that maps an email address or the domain part to the desired virtual
+username. For example:
+.Bd -literal -offset indent
+j...@example.orgjoe
+j...@example.comjack
+.Ed
+.Pp
 .Ss Source tables
 Source tables are lists of IPv4 and IPv6 addresses.
 They can only be used in the following context:



Corrected patch for smtpd.conf(5) man page

2018-09-02 Thread Matt Schwartz
The earlier patch I created was obviously no good. Sorry for the
noise. Included is the fixed patch that just adds some text for
properly using an mda wrapper in the actions:

Index: smtpd.conf.5
===
RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v
retrieving revision 1.199
diff -u -p -u -r1.199 smtpd.conf.5
--- smtpd.conf.51 Sep 2018 19:56:28 -   1.199
+++ smtpd.conf.52 Sep 2018 15:53:57 -
@@ -205,6 +205,9 @@ Use the mapping
 for virtual expansion.
 The aliasing table format is described in
 .Xr table 5 .
+.It Cm wrapper Ar name
+Use the wrapper specified in
+.Cm mda wrapper.
 .El
 .Pp
 The relay delivery methods also support additional options:



Update to smtpd.conf(5) man page

2018-09-02 Thread Matt Schwartz
Hello tech@,

Below is a patch to clarify how/where to use the mda wrapper feature
of OpenSMTPD:

--- smtpd.conf.5Sun Sep  2 10:16:26 2018
+++ smtpd.conf.5.newSun Sep  2 10:16:53 2018
@@ -159,7 +159,7 @@
 Relay the message to another SMTP server.
 .It Cm wrapper Ar name
 Use the wrapper specified in
-.Cm mda wrapper
+.Cm mda wrapper.
 .El
 .Pp
 The local delivery methods support additional options:

Thanks,
Matt



[patch] 6.3 /etc/examples/relayd.conf

2018-03-24 Thread Matt Schwartz
Hi tech@,

One more quick change to the TLS acceleration example in
/etc/examples/relayd.conf. The man page recommends match header set
"Keep-Alive" value "$TIMEOUT" while the example in
/etc/examples/relayd.conf uses match request header set "Connection"
value "close"

This tripped me up once when I forgot to make this change and couldn't
understand why I was running into difficulty with the connection
closing prematurely. Diff below

Thanks,
Matt


Index: relayd.conf
===
RCS file: /cvs/src/etc/examples/relayd.conf,v
retrieving revision 1.3
diff -u -p -r1.3 relayd.conf
--- relayd.conf 12 Dec 2014 10:05:09 -  1.3
+++ relayd.conf 24 Mar 2018 14:02:21 -
@@ -40,13 +40,15 @@ http protocol https {
match request header append "X-Forwarded-For" value "$REMOTE_ADDR"
match request header append "X-Forwarded-By" \
value "$SERVER_ADDR:$SERVER_PORT"
-   match request header set "Connection" value "close"
+   match header set "Keep-Alive" value "$TIMEOUT"
+
+   match query hash "sessid"

# Various TCP performance options
tcp { nodelay, sack, socket buffer 65536, backlog 128 }

 #  tls { no tlsv1.0, ciphers HIGH }
-#  tls session cache disable
+#  tls no session tickets
 }

 relay wwwtls {



[patch] 6.3 relayd.conf(5) man page correction

2018-03-24 Thread Matt Schwartz
Hi tech@,

One small correction to relayd.conf(5). In the examples section for
TLS acceleration, the configuration option match hash "sessid" results
in a syntax error. Diff below.

Thanks,
Matt

Index: relayd.conf.5
===
RCS file: /cvs/src/usr.sbin/relayd/relayd.conf.5,v
retrieving revision 1.182
diff -u -p -r1.182 relayd.conf.5
--- relayd.conf.5   29 Nov 2017 21:17:51 -  1.182
+++ relayd.conf.5   24 Mar 2018 13:47:17 -
@@ -1484,7 +1484,6 @@ http protocol "https" {
match header set "Keep-Alive" value "$TIMEOUT"

match query hash "sessid"
-   match hash "sessid"

pass
block path "/cgi-bin/index.cgi" value "*command=*"



[patch] openssl.1 man page

2018-03-22 Thread Matt Schwartz
Hi tech@,

I found a small typo in the openssl(1) man page. Diff below.

Thanks,
Matt

Index: openssl.1
===
RCS file: /cvs/src/usr.bin/openssl/openssl.1,v
retrieving revision 1.88
diff -u -p -r1.88 openssl.1
--- openssl.1   28 Feb 2018 20:36:09 -  1.88
+++ openssl.1   22 Mar 2018 19:03:30 -
@@ -3404,7 +3404,7 @@ These are compiled into
 .Nm openssl
 and include the usual values such as
 .Cm commonName , countryName , localityName , organizationName ,
-.Cm organizationUnitName , stateOrProvinceName .
+.Cm organizationalUnitName , stateOrProvinceName .
 Additionally,
 .Cm emailAddress
 is included as well as



[patch] /etc/examples/relayd.conf

2018-03-22 Thread Matt Schwartz
Hi @tech,

Below is a diff to correct the example relayd.conf in /etc/examples.
The option, tls session cache disable has been changed as per the man
page to tls no session tickets.

Thanks,
Matt


Index: relayd.conf
===
RCS file: /cvs/src/etc/examples/relayd.conf,v
retrieving revision 1.3
diff -u -p -r1.3 relayd.conf
--- relayd.conf 12 Dec 2014 10:05:09 -  1.3
+++ relayd.conf 22 Mar 2018 18:54:15 -
@@ -46,7 +46,7 @@ http protocol https {
tcp { nodelay, sack, socket buffer 65536, backlog 128 }

 #  tls { no tlsv1.0, ciphers HIGH }
-#  tls session cache disable
+#  tls no session tickets
 }

 relay wwwtls {