[Midnightbsd-cvs] src [10715] trunk/usr.sbin/lpr/lpq/lpq.c: sync

[laffer1 at midnightbsd.org]

Revision: 10715
          http://svnweb.midnightbsd.org/src/?rev=10715
Author:   laffer1
Date:     2018-06-09 17:32:58 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/usr.sbin/lpr/lpq/Makefile
    trunk/usr.sbin/lpr/lpq/lpq.1
    trunk/usr.sbin/lpr/lpq/lpq.c

Property Changed:
----------------
    trunk/usr.sbin/lpr/lpq/lpq.1

Modified: trunk/usr.sbin/lpr/lpq/Makefile
===================================================================
--- trunk/usr.sbin/lpr/lpq/Makefile	2018-06-09 21:32:00 UTC (rev 10714)
+++ trunk/usr.sbin/lpr/lpq/Makefile	2018-06-09 21:32:58 UTC (rev 10715)
@@ -1,5 +1,6 @@
+# $MidnightBSD$
 #	From: @(#)Makefile	8.1 (Berkeley) 6/6/93
-# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/lpr/lpq/Makefile 321275 2017-07-20 01:07:02Z ngie $
 
 BINDIR=	/usr/bin
 
@@ -8,7 +9,7 @@
 BINGRP=	daemon
 BINMODE= 6555
 
-CFLAGS+= -I${.CURDIR}/../common_source
+CFLAGS+= -I${.CURDIR:H}/common_source
 
 DPADD=	${LIBLPR}
 LDADD=	${LIBLPR}

Modified: trunk/usr.sbin/lpr/lpq/lpq.1
===================================================================
--- trunk/usr.sbin/lpr/lpq/lpq.1	2018-06-09 21:32:00 UTC (rev 10714)
+++ trunk/usr.sbin/lpr/lpq/lpq.1	2018-06-09 21:32:58 UTC (rev 10715)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 1983, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -26,7 +27,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)lpq.1	8.2 (Berkeley) 4/28/95
-.\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.sbin/lpr/lpq/lpq.1 216372 2010-12-11 09:38:12Z joel $
 .\"
 .Dd April 28, 1995
 .Dt LPQ 1


Property changes on: trunk/usr.sbin/lpr/lpq/lpq.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/lpr/lpq/lpq.c
===================================================================
--- trunk/usr.sbin/lpr/lpq/lpq.c	2018-06-09 21:32:00 UTC (rev 10714)
+++ trunk/usr.sbin/lpr/lpq/lpq.c	2018-06-09 21:32:58 UTC (rev 10715)
@@ -88,7 +88,7 @@
 	printer = NULL;
 	euid = geteuid();
 	uid = getuid();
-	seteuid(uid);
+	PRIV_END
 	progname = *argv;
 	if (gethostname(local_host, sizeof(local_host)))
 		err(1, "gethostname");