diff options
| -rw-r--r-- | usr.sbin/lpr/SMM.doc/3.t | 7 | ||||
| -rw-r--r-- | usr.sbin/lpr/lpd/lpd.c | 9 | ||||
| -rw-r--r-- | usr.sbin/lpr/lprm/Makefile | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/usr.sbin/lpr/SMM.doc/3.t b/usr.sbin/lpr/SMM.doc/3.t index 0b1ea2d5973..148a47cbcea 100644 --- a/usr.sbin/lpr/SMM.doc/3.t +++ b/usr.sbin/lpr/SMM.doc/3.t @@ -1,4 +1,4 @@ -.\" $OpenBSD: 3.t,v 1.3 2002/06/08 01:53:43 millert Exp $ +.\" $OpenBSD: 3.t,v 1.4 2002/06/11 22:47:07 millert Exp $ .\" .\" Copyright (c) 1983, 1993 .\" The Regents of the University of California. All rights reserved. @@ -45,11 +45,10 @@ spooling areas is as follows: The spooling area is writable only by \fIroot\fP and and the \fIdaemon\fP group. .IP \(bu 3 -The \fIlpr\fP program runs set-user-id to user \fIdaemon\fP and +The \fIlpr\fP and \fIlprm\fP programs run set-user-id to user \fIdaemon\fP and set-group-id to group \fIdaemon\fP. .IP \(bu 3 -The utility programs, -\fIlpc\fP, \fIlpq\fP and \fIlprm\fP run set-group-id to group \fIdaemon\fP +The \fIlpc\fP and \fIlpq\fP programs run set-group-id to group \fIdaemon\fP to access spool files. .IP \(bu 3 Control and data files in a spooling area are made with \fIdaemon\fP diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index eb7ecb6b95d..2add61f1952 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lpd.c,v 1.35 2002/06/08 18:13:34 millert Exp $ */ +/* $OpenBSD: lpd.c,v 1.36 2002/06/11 22:47:07 millert Exp $ */ /* $NetBSD: lpd.c,v 1.33 2002/01/21 14:42:29 wiz Exp $ */ /* @@ -45,7 +45,7 @@ static const char copyright[] = #if 0 static const char sccsid[] = "@(#)lpd.c 8.7 (Berkeley) 5/10/95"; #else -static const char rcsid[] = "$OpenBSD: lpd.c,v 1.35 2002/06/08 18:13:34 millert Exp $"; +static const char rcsid[] = "$OpenBSD: lpd.c,v 1.36 2002/06/11 22:47:07 millert Exp $"; #endif #endif /* not lint */ @@ -72,10 +72,11 @@ static const char rcsid[] = "$OpenBSD: lpd.c,v 1.35 2002/06/08 18:13:34 millert * 3. lpd runs as root but spends most of its time with its effective * uid and gid set to the uid/gid specified in the passwd entry for * DEFUID (1, aka daemon). - * 4. lpr runs setuid daemon and setgrp daemon; it opens + * 4. lpr and lprm run setuid daemon and setgrp daemon. lpr opens * files to be printed with its real uid/gid and writes to * the spool dir with its effective uid/gid (i.e. daemon). - * 5. lpc, lpr and lprm run setgrp daemon. + * lprm need to run as user daemon so it can kill lpd. + * 5. lpc and lpq run setgrp daemon. * * Users can't touch the spool w/o the help of one of the lp* programs. */ diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index d132b8151b5..42680d45f7a 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -1,11 +1,12 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 -# $OpenBSD: Makefile,v 1.4 2002/06/08 01:53:43 millert Exp $ +# $OpenBSD: Makefile,v 1.5 2002/06/11 22:47:07 millert Exp $ PROG= lprm CFLAGS+=-I${.CURDIR}/../common_source SRCS= lprm.c rmjob.c startdaemon.c common.c common_vars.c +BINOWN= daemon BINGRP= daemon -BINMODE=2555 +BINMODE=6555 BINDIR= /usr/bin .PATH: ${.CURDIR}/../common_source |