match /etc/examples/printcap with spool directory in lpr/common_source/pathnames.h

2016-02-25 Thread Chris Bennett
/etc/examples/printcap doesn't match
#define _PATH_DEFSPOOL  "/var/spool/output/lpd"

Which seems sensible to keep lpd jobs out of output directory

Index: printcap
===
RCS file: /cvs/src/etc/examples/printcap,v
retrieving revision 1.1
diff -u -p -r1.1 printcap
--- printcap12 Jul 2014 03:52:39 -  1.1
+++ printcap25 Feb 2016 20:53:56 -
@@ -1,7 +1,7 @@
 #  $OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $
 
 #lp|local line printer:\
-#  :lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+#  :lp=/dev/lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
 
 #rp|remote line printer:\
-#  :lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
+#  :lp=:rm=printhost:rp=lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:

OK?

Chris



Re: match /etc/examples/printcap with spool directory in lpr/common_source/pathnames.h

2016-02-25 Thread Theo de Raadt
Chris, you continue to amaze me.

Upon running sysmerge, that will break everyone's setup.

Like, can you try stuff before you send it out?

I'm done.

> /etc/examples/printcap doesn't match
> #define   _PATH_DEFSPOOL  "/var/spool/output/lpd"
> 
> Which seems sensible to keep lpd jobs out of output directory
> 
> Index: printcap
> ===
> RCS file: /cvs/src/etc/examples/printcap,v
> retrieving revision 1.1
> diff -u -p -r1.1 printcap
> --- printcap  12 Jul 2014 03:52:39 -  1.1
> +++ printcap  25 Feb 2016 20:53:56 -
> @@ -1,7 +1,7 @@
>  #$OpenBSD: printcap,v 1.1 2014/07/12 03:52:39 deraadt Exp $
>  
>  #lp|local line printer:\
> -#:lp=/dev/lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
> +#:lp=/dev/lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
>  
>  #rp|remote line printer:\
> -#:lp=:rm=printhost:rp=lp:sd=/var/spool/output:lf=/var/log/lpd-errs:
> +#:lp=:rm=printhost:rp=lp:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
> 
> OK?
> 
> Chris
> 



Re: match /etc/examples/printcap with spool directory in lpr/common_source/pathnames.h

2016-02-25 Thread Chris Bennett
On Thu, Feb 25, 2016 at 07:56:54PM -0700, Theo de Raadt wrote:
> Chris, you continue to amaze me.
> 
> Upon running sysmerge, that will break everyone's setup.
> 
> Like, can you try stuff before you send it out?
> 
> I'm done.
> 

Sorry. It was my misunderstanding that files in /etc/examples were
optional and did not receive the same treatment as mandatory files such
as /etc/hosts.
I did not think that this was an item that needed to be tested, since
this was merely an example of how a configuration file could be started
and details found in the manual pages.

I will just have to make more mistakes and be corrected until I get it
right.

I will look deeper into sysmerge, hopefully with some help to properly
resolve this problem.

Chris