Install the USB backend to run as root.

diff --git a/CHANGES.md b/CHANGES.md
index a26671c06f353dfa0e3fcc9f1abe3758bde3173c..70db81782225e17e7fa0d58663214ba03bd4c8b8 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,7 @@ CUPS v2.4rc1 (Pending)
 - Kerberos (`AuthType Negotiate`) authentication is now deprecated (Issue #98)
 - The PPD functions now treat boolean values as case-insensitive (Issue #106)
 - Temporary queue names no longer end with an underscore (Issue #110)
+- The USB backend now runs as root (Issue #121)
 - Removed support for the (long deprecated and unused) `FontPath`,
   `LPDConfigFile`, `RIPCache`, and `SMBConfigFile` directives in `cupsd.conf`
   and `cups-files.conf`.

diff --git a/backend/Makefile b/backend/Makefile
index 8ddf6abbde53d9535cb09f1a4b8815da5a33925c..caa7b53d8733e19c608a7666aaa04bf20ba9c9ba 100644 (file)
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -1,10 +1,12 @@
 #
 # Backend makefile for CUPS.
 #
-# Copyright 2007-2019 by Apple Inc.
-# Copyright 1997-2007 by Easy Software Products, all rights reserved.
+# Copyright © 2021 by OpenPrinting.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 include ../Makedefs
@@ -15,19 +17,18 @@ include ../Makedefs
 
 # RBACKENDS are installed mode 0744 so cupsd will run them as root...
 #
-# UBACKENDS and ULBACKENDS are installed mode 0755 so cupsd will run them as
-# an unprivileged user...
+# UBACKENDS are installed mode 0755 so cupsd will run them as an unprivileged
+# user...
 #
 # See http://www.cups.org/doc/api-filter.html for more info...
 RBACKENDS =    \
                ipp \
                lpd \
+               usb \
                $(DNSSD_BACKEND)
 UBACKENDS =    \
                snmp \
                socket
-ULBACKENDS =   \
-               usb
 UNITTESTS =    \
                test1284 \
                testbackend \
@@ -35,8 +36,7 @@ UNITTESTS =   \
 TARGETS =      \
                libbackend.a \
                $(RBACKENDS) \
-               $(UBACKENDS) \
-               $(ULBACKENDS)
+               $(UBACKENDS)
 LIBOBJS        =       \
                ieee1284.o \
                network.o \
@@ -65,7 +65,7 @@ all:  $(TARGETS)
 # Make library targets...
 #
 
-libs:  $(ULBACKENDS)
+libs:
 
 
 #
@@ -161,18 +161,6 @@ install-headers:
 #
 
 install-libs:
-       echo Installing backends in $(SERVERBIN)/backend
-       $(INSTALL_DIR) -m 755 $(SERVERBIN)/backend
-       for file in $(ULBACKENDS); do \
-               $(INSTALL_BIN) $$file $(SERVERBIN)/backend; \
-       done
-       if test "x$(SYMROOT)" != "x"; then \
-               $(INSTALL_DIR) $(SYMROOT); \
-               for file in $(ULBACKENDS); do \
-                       cp $$file $(SYMROOT); \
-                       dsymutil $(SYMROOT)/$$file; \
-               done \
-       fi
 
 
 #
@@ -185,7 +173,7 @@ uninstall:
                $(RM) $(SERVERBIN)/apple/$$file; \
        done
        -$(RMDIR) $(SERVERBIN)/apple
-       for file in $(RBACKENDS) $(UBACKENDS) $(ULBACKENDS); do \
+       for file in $(RBACKENDS) $(UBACKENDS); do \
                $(RM) $(SERVERBIN)/backend/$$file; \
        done
        for file in $(IPPALIASES); do \