On Thu, May 15, 2014 at 10:40:27PM +0200, Frank Brodbeck wrote: > Hi Jason, > > On Wed, May 14, 2014 at 11:16:59PM +0059, Jason McIntyre wrote: > > it's still missing some <>. also i think we can wholly simplify the > > auth/auth-optional line. > > Heh. Thought I found all, thanks for fixing the rest. > > > -.Op Ic auth | auth-optional | auth Ar authtable | Ic auth-optional Ar > > authtable > > +.Op Ic auth | auth-optional Aq Ar authtable > > the man page sates that: > > Both auth and auth-optional accept an optional table as a > parameter. When provided, credentials are looked up in this > table. > > but reading the new smtpd.conf(5) gives the impression that authtable is > mandatory. I haven't checked the code but the following passes a check > with smtpd -n > > listen on iwn0 tls auth > listen on em0 tls auth-optional > > so it seems to be a valid syntax. >
it's why i added the word "optional" to the description. the syntax [<table>] is really ugly, and is hard to understand. we could do it, but i don;t want to. sometimes it's better to sacrifice being a million percent correct for clarity. jmc > Index: usr.sbin/smtpd/smtpd.conf.5 > =================================================================== > RCS file: /cvs/src/usr.sbin/smtpd/smtpd.conf.5,v > retrieving revision 1.118 > diff -u -r1.118 smtpd.conf.5 > --- usr.sbin/smtpd/smtpd.conf.5 15 May 2014 19:36:45 -0000 1.118 > +++ usr.sbin/smtpd/smtpd.conf.5 15 May 2014 20:40:52 -0000 > @@ -594,7 +594,9 @@ > .Op Ic port Ar port > .Op Ic tls | tls-require | tls-require verify | smtps | secure > .Op Ic pki Ar pkiname > -.Op Ic auth | auth-optional Aq Ar authtable > +.Oo Ic auth | auth-optional > +.Op Aq Ar authtable > +.Oc > .Op Ic tag Ar tag > .Op Ic hostname Ar hostname > .Op Ic hostnames Aq Ar names >
