From ee347e17be80cfc009203f6165ff174ea288514c Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 8 Nov 2018 09:51:21 -0500 Subject: [PATCH] Add note about restarting the scheduler manually after editing config files (Issue #5402) --- CHANGES.md | 2 +- man/cups-files.conf.man.in | 16 ++++++++++++---- man/cupsd.conf.man.in | 24 ++++++++++++++++-------- 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 95b5c4ce09..6c04aeb5af 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,7 +6,7 @@ Changes in CUPS v2.3b6 - Localization update (Issue #5339, Issue #5348, Issue #5362, Issue #5408, Issue #5410) -- Documentation updates (Issue #5369, Issue #5403, Issue #5404) +- Documentation updates (Issue #5369, Issue #5402, Issue #5403, Issue #5404) - The lpadmin command would create a non-working printer in some error cases (Issue #5305) - The scheduler would crash if an empty `AccessLog` directive was specified diff --git a/man/cups-files.conf.man.in b/man/cups-files.conf.man.in index baf3cb6af7..839cde96fc 100644 --- a/man/cups-files.conf.man.in +++ b/man/cups-files.conf.man.in @@ -1,12 +1,13 @@ .\" .\" cups-files.conf man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" 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. .\" -.TH cups-files.conf 5 "CUPS" "21 September 2017" "Apple Inc." +.TH cups-files.conf 5 "CUPS" "8 November 2018" "Apple Inc." .SH NAME cups\-files.conf \- file and directory configuration file for cups .SH DESCRIPTION @@ -269,6 +270,13 @@ Specifies the format to use for the Printcap file. .TP 5 \fBSMBConfigFile \fIfilename\fR Specifies the SMB service configuration file to update. +.SH NOTES +The scheduler MUST be restarted manually after making changes to the \fBcups-files.conf\fR file. +On Linux this is typically done using the +.BR systemctl (8) +command, while on macOS the +.BR launchctl (8) +command is used instead. .SH SEE ALSO .BR classes.conf (5), .BR cups (1), diff --git a/man/cupsd.conf.man.in b/man/cupsd.conf.man.in index 36c8493987..c9b5a287b3 100644 --- a/man/cupsd.conf.man.in +++ b/man/cupsd.conf.man.in @@ -1,12 +1,13 @@ .\" .\" cupsd.conf man page for CUPS. .\" -.\" Copyright 2007-2018 by Apple Inc. -.\" Copyright 1997-2006 by Easy Software Products. +.\" Copyright © 2007-2018 by Apple Inc. +.\" Copyright © 1997-2006 by Easy Software Products. .\" -.\" 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. .\" -.TH cupsd.conf 5 "CUPS" "24 April 2018" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "8 November 2018" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION @@ -17,10 +18,6 @@ file configures the CUPS scheduler, It is normally located in the .I /etc/cups directory. -\fBNote:\fR File, directory, and user configuration directives that used to be allowed in the \fBcupsd.conf\fR file are now stored in the -.BR cups-files.conf (5) -file instead in order to prevent certain types of privilege escalation attacks. -.LP Each line in the file can be a configuration directive, a blank line, or a comment. Configuration directives typically consist of a name and zero or more values separated by whitespace. The configuration directive name and values are case-insensitive. @@ -856,6 +853,17 @@ Use "%{job-impressions-completed}" to insert the number of pages (sides) that we \fBRIPCache \fIsize\fR Specifies the maximum amount of memory to use when converting documents into bitmaps for a printer. The default is "128m". +.SH NOTES +File, directory, and user configuration directives that used to be allowed in the \fBcupsd.conf\fR file are now stored in the +.BR cups-files.conf (5) +file instead in order to prevent certain types of privilege escalation attacks. +.PP +The scheduler MUST be restarted manually after making changes to the \fBcupsd.conf\fR file. +On Linux this is typically done using the +.BR systemctl (8) +command, while on macOS the +.BR launchctl (8) +command is used instead. .SH CONFORMING TO The \fBcupsd.conf\fR file format is based on the Apache HTTP Server configuration file format. .SH EXAMPLES -- 2.47.2