From 1266d825862e0200d3ac447fa46d81689c901354 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 18 May 2002 23:03:05 +0000 Subject: Update paths from 4.3BSD to 4.4BSD; partially from NetBSD --- usr.sbin/lpr/SMM.doc/1.t | 14 +++++++------- usr.sbin/lpr/SMM.doc/2.t | 4 ++-- usr.sbin/lpr/SMM.doc/4.t | 26 +++++++++++++------------- usr.sbin/lpr/SMM.doc/7.t | 8 ++++---- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/usr.sbin/lpr/SMM.doc/1.t b/usr.sbin/lpr/SMM.doc/1.t index b6f4f253210..19e0bafaf5c 100644 --- a/usr.sbin/lpr/SMM.doc/1.t +++ b/usr.sbin/lpr/SMM.doc/1.t @@ -1,4 +1,4 @@ -.\" $OpenBSD: 1.t,v 1.2 1997/01/17 15:54:15 millert Exp $ +.\" $OpenBSD: 1.t,v 1.3 2002/05/18 23:03:04 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -58,12 +58,12 @@ following files and commands: .TS l l. /etc/printcap printer configuration and capability data base -/usr/lib/lpd line printer daemon, does all the real work -/usr/ucb/lpr program to enter a job in a printer queue -/usr/ucb/lpq spooling queue examination program -/usr/ucb/lprm program to delete jobs from a queue -/etc/lpc program to administer printers and spooling queues -/dev/printer socket on which lpd listens +/usr/sbin/lpd line printer daemon, does all the real work +/usr/bin/lpr program to enter a job in a printer queue +/usr/bin/lpq spooling queue examination program +/usr/bin/lprm program to delete jobs from a queue +/usr/sbin/lpc program to administer printers and spooling queues +/var/run/printer socket on which lpd listens .TE .DE The file /etc/printcap is a master data base describing line diff --git a/usr.sbin/lpr/SMM.doc/2.t b/usr.sbin/lpr/SMM.doc/2.t index 5dbdb905d50..9006ed037cf 100644 --- a/usr.sbin/lpr/SMM.doc/2.t +++ b/usr.sbin/lpr/SMM.doc/2.t @@ -1,4 +1,4 @@ -.\" $OpenBSD: 2.t,v 1.2 1997/01/17 15:54:16 millert Exp $ +.\" $OpenBSD: 2.t,v 1.3 2002/05/18 23:03:04 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -51,7 +51,7 @@ database restarting any printers that have jobs. In normal operation .I lpd listens for service requests on multiple sockets, -one in the UNIX domain (named ``/dev/printer'') for +one in the UNIX domain (named ``/var/run/printer'') for local requests, and one in the Internet domain (under the ``printer'' service specification) for requests for printer access from off machine; diff --git a/usr.sbin/lpr/SMM.doc/4.t b/usr.sbin/lpr/SMM.doc/4.t index c96a9029206..61f50513ca2 100644 --- a/usr.sbin/lpr/SMM.doc/4.t +++ b/usr.sbin/lpr/SMM.doc/4.t @@ -1,4 +1,4 @@ -.\" $OpenBSD: 4.t,v 1.2 1997/01/17 15:54:17 millert Exp $ +.\" $OpenBSD: 4.t,v 1.3 2002/05/18 23:03:04 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -39,7 +39,7 @@ Setting up The 4.3BSD release comes with the necessary programs installed and with the default line printer queue created. If the system must be modified, the -makefile in the directory /usr/src/usr.lib/lpr +makefile in the directory /usr/src/usr.sbin/lpr should be used in recompiling and reinstalling the necessary programs. .PP @@ -70,7 +70,7 @@ locally via a 1200 baud serial line. .DT lp|LA-180 DecWriter III:\e :lp=/dev/lp:br#1200:fs#06320:\e - :tr=\ef:of=/usr/lib/lpf:lf=/usr/adm/lpd-errs: + :tr=\ef:of=/usr/libexec/lpr/lpf:lf=/var/log/lpd-errs: .DE The .B lp @@ -93,7 +93,7 @@ entry specifies the filter program should be used for printing the files; more will be said about filters later. The last entry causes errors -to be written to the file ``/usr/adm/lpd-errs'' +to be written to the file ``/var/log/lpd-errs'' instead of the console. Most errors from \fIlpd\fP are logged using \fIsyslogd\fP\|(8) and will not be logged in the specified file. The filters should use \fIsyslogd\fP to report errors; only those that @@ -111,7 +111,7 @@ named ``lp'' on the machine ``ucbvax''. .DS .DT lp|default line printer:\e - :lp=:rm=ucbvax:rp=lp:sd=/usr/spool/vaxlpd: + :lp=:rm=ucbvax:rp=lp:sd=/var/spool/output/vaxlpd: .DE The .B rm @@ -124,9 +124,9 @@ the name of the printer on the remote machine is ``lp''; here it could be left out since this is the default value. The .B sd -entry specifies ``/usr/spool/vaxlpd'' +entry specifies ``/var/spool/output/vaxlpd'' as the spooling directory instead of the -default value of ``/usr/spool/lpd''. +default value of ``/var/spool/lpd''. .NH 2 Output filters .PP @@ -152,12 +152,12 @@ is the Benson-Varian. .DS .DT va|varian|Benson-Varian:\e - :lp=/dev/va0:sd=/usr/spool/vad:of=/usr/lib/vpf:\e - :tf=/usr/lib/rvcat:mx#2000:pl#58:px=2112:py=1700:tr=\ef: + :lp=/dev/va0:sd=/var/spool/output/vad:of=/usr/libexec/lpr/vpf:\e + :tf=/usr/libexec/lpr/rvcat:mx#2000:pl#58:px=2112:py=1700:tr=\ef: .DE The .B tf -entry specifies ``/usr/lib/rvcat'' as the filter to be +entry specifies ``/usr/libexec/lpr/rvcat'' as the filter to be used in printing \fItroff\fP\|(1) output. This filter is needed to set the device into print mode for text, and plot mode for printing @@ -173,9 +173,9 @@ filter as shown below. .DS .DT va|varian|Benson-Varian:\e - :lp=/dev/va0:sd=/usr/spool/vad:of=/usr/lib/vpf:\e - :if=/usr/lib/vpf:tf=/usr/lib/rvcat:af=/usr/adm/vaacct:\e - :mx#2000:pl#58:px=2112:py=1700:tr=\ef: + :lp=/dev/va0:sd=/var/spool/output/vad:of=/usr/libexec/lpr/vpf:\e + :if=/usr/libexec/lpr/vpf:tf=/usr/libexec/lpr/rvcat:\e + :af=/var/log/vaacct:mx#2000:pl#58:px=2112:py=1700:tr=\ef: .DE .NH 2 Access Control diff --git a/usr.sbin/lpr/SMM.doc/7.t b/usr.sbin/lpr/SMM.doc/7.t index cf28a88873b..f7a85808285 100644 --- a/usr.sbin/lpr/SMM.doc/7.t +++ b/usr.sbin/lpr/SMM.doc/7.t @@ -1,4 +1,4 @@ -.\" $OpenBSD: 7.t,v 1.2 1997/01/17 15:54:18 millert Exp $ +.\" $OpenBSD: 7.t,v 1.3 2002/05/18 23:03:04 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -66,7 +66,7 @@ The connection to on the local machine failed. This usually means the printer server started at boot time has died or is hung. Check the local socket -/dev/printer to be sure it still exists (if it does not exist, +/var/run/printer to be sure it still exists (if it does not exist, there is no .I lpd process running). @@ -78,7 +78,7 @@ restart .DE You can also check the state of the master printer daemon with the following. .DS -% ps l`cat /usr/spool/lpd.lock` +% ps l`cat /var/run/lpd.pid` .DE .IP Another possibility is that the @@ -86,7 +86,7 @@ Another possibility is that the program is not set-user-id to \fIroot\fP, set-group-id to group \fIdaemon\fP. This can be checked with .DS -% ls \-lg /usr/ucb/lpr +% ls \-lg /usr/bin/lpr .DE .SH lpr: \fIprinter\fP\|: printer queue is disabled -- cgit v1.2.3