-AccessLog /var/log/cups/access_log -AccessLog /var/log/cups/access_log-%s -AccessLog syslog -- -
The AccessLog directive sets the name of the
-access log file. If the filename is not absolute then it is
-assumed to be relative to the ServerRoot directory. The
-access log file is stored in "common log format" and can be used
-by any web access reporting tool to generate a report on CUPS
-server activity.
The server name can be included in the filename by using
-%s in the name.
The special name "syslog" can be used to send the access -information to the system log instead of a plain file.
- -The default access log file is -@CUPS_LOGDIR@/access_log.
- -LocationLimit section.
--<Location /path> - ... - AuthClass Anonymous - AuthClass User - AuthClass System - AuthClass Group -</Location> -- -
The AuthClass directive defines what level of
-authentication is required:
Anonymous - No authentication should be
- performed (default)User - A valid username and password is
- requiredSystem - A valid username and password
- is required, and the username must belong to the "sys"
- group; this can be changed using the SystemGroup
- directiveGroup - A valid username and password is
- required, and the username must belong to the group named
- by the AuthGroupName
- directiveThe AuthClass directive must appear inside a Location or Limit section.
This directive is deprecated and will be removed from a
-future release of CUPS. Consider using the more flexible Require directive instead.
-<Location /path> - ... - AuthGroupName mygroup - AuthGroupName lp -</Location> -- -
The AuthGroupName directive sets the group to use
-for Group authentication.
The AuthGroupName directive must appear inside a
-Location or Limit section.
This directive is deprecated and will be removed from a
-future release of CUPS. Consider using the more flexible Require directive instead.
The default is to not allow classification overrides.
--ConfigFilePerm 0644 -ConfigFilePerm 0640 -- -
The ConfigFilePerm directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.
Note: - -- - -The permissions for the printers.conf file are always masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature.
- -
-DataDir /usr/share/cups -- -
The DataDir directive sets the directory to use
-for data files.
-DocumentRoot /usr/share/doc/cups -DocumentRoot /foo/bar/doc/cups -- -
The DocumentRoot directive specifies the location
-of web content for the HTTP server in CUPS. If an absolute path
-is not specified then it is assumed to be relative to the ServerRoot directory. The
-default directory is @CUPS_DOCROOT@.
Documents are first looked up in a sub-directory for the
-primary language requested by the client (e.g.
-@CUPS_DOCROOT@/fr/...) and then directly under
-the DocumentRoot directory (e.g.
-@CUPS_DOCROOT@/...), so it is possible to
-localize the web content by providing subdirectories for each
-language needed.
IfRequested for all locations.
--ErrorLog /var/log/cups/error_log -ErrorLog /var/log/cups/error_log-%s -ErrorLog syslog -- -
The ErrorLog directive sets the name of the error
-log file. If the filename is not absolute then it is assumed to
-be relative to the ServerRoot directory. The
-default error log file is @CUPS_LOGDIR@/error_log.
The server name can be included in the filename by using
-%s in the name.
The special name "syslog" can be used to send the error -information to the system log instead of a plain file.
- --FatalErrors none -FatalErrors all -FatalErrors browse -FatalErrors config -FatalErrors listen -FatalErrors log -FatalErrors permissions -FatalErrors all -permissions -FatalErrors config permissions log -- -
The FatalErrors directive determines whether certain kinds of
-errors are fatal. The following kinds of errors are currently recognized:
none - No errors are fatalall - All of the errors below are fatalbrowse - Browsing initialization errors are fatal,
- for example failed binding to the CUPS browse port or failed connections
- to LDAP serversconfig - Configuration file syntax errors are
- fatallisten - Listen or Port errors are fatal, except for
- IPv6 failures on the loopback or "any" addresseslog - Log file creation or write errors are fatalpermissions - Bad startup file permissions are
- fatal, for example shared SSL certificate and key files with world-
- read permissionsMultiple errors can be listed, and the form "-kind" can be used with
-all to remove specific kinds of errors. The default setting is
-@CUPS_FATAL_ERRORS@.
-FileDevice Yes -FileDevice No -- -
The FileDevice directive determines whether the
-scheduler allows new printers to be added using device URIs of
-the form file:/filename. File devices are most often
-used to test new printer drivers and do not support raw file
-printing.
The default setting is No.
Note: - -- -File devices are managed by the scheduler. Since the -scheduler normally runs as the root user, file devices -can be used to overwrite system files and potentially -gain unauthorized access to the system. If you must -create printers using file devices, we recommend that -you set the
- -FileDevicedirective to -Yesfor only as long as you need to add the -printers to the system, and then reset the directive to -No.
-FontPath /foo/bar/fonts -FontPath /usr/share/cups/fonts:/foo/bar/fonts -- -
The FontPath directive specifies the font path to
-use when searching for fonts. The default font path is
-/usr/share/cups/fonts.
-Group lp -Group nobody -- -
The Group directive specifies the UNIX group that
-filter and CGI programs run as. The default group is
-system-specific but is usually lp or
-nobody.
-LogFilePerm 0644 -LogFilePerm 0600 -- -
The LogFilePerm directive specifies the
-permissions to use when writing log files. The default
-is @CUPS_LOG_FILE_PERM@.
LocationLimit section.
--PageLog /var/log/cups/page_log -PageLog /var/log/cups/page_log-%s -PageLog syslog -- -
The PageLog directive sets the name of the page
-log file. If the filename is not absolute then it is assumed to
-be relative to the ServerRoot directory. The
-default page log file is @CUPS_LOGDIR@/page_log.
The server name can be included in the filename by using
-%s in the name.
The special name "syslog" can be used to send the page -information to the system log instead of a plain file.
- --Printcap -Printcap /etc/printcap -Printcap /etc/printers.conf -Printcap /Library/Preferences/org.cups.printers.plist -- -
The Printcap directive controls whether or not a
-printcap file is automatically generated and updated with a list
-of available printers. If specified with no value, then no
-printcap file will be generated. The default is to generate a
-file named @CUPS_DEFAUL_PRINTCAP@.
When a filename is specified (e.g. @CUPS_DEFAULT_PRINTCAP@), -the printcap file is written whenever a printer is added or -removed. The printcap file can then be used by applications that -are hardcoded to look at the printcap file for the available -printers.
- - --PrintcapFormat BSD -PrintcapFormat Solaris -PrintcapFormat plist -- -
The PrintcapFormat directive controls the output format of the
-printcap file. The default is to generate the plist format on Mac OS X, the
-Solaris format on Solaris, and the BSD format on other operating systems.
-PrintGUI /usr/bin/glpoptions -- -
The PrintcapGUI directive sets the program to
-associate with the IRIX printer GUI interface script which is
-used by IRIX applications to display printer-specific options.
-There is no default program.
-RemoteRoot remroot -RemoteRoot root -- -
The RemoteRoot directive sets the username for
-unauthenticated root requests from remote hosts. The default
-username is remroot. Setting RemoteRoot
-to root effectively disables this security
-mechanism.
-RequestRoot /var/spool/cups -RequestRoot /foo/bar/spool/cups -- -
The RequestRoot directive sets the directory for
-incoming IPP requests and HTML forms. If an absolute path is not
-provided then it is assumed to be relative to the ServerRoot directory. The
-default request directory is @CUPS_REQUESTS@.
-ServerBin /usr/lib/cups -ServerBin /foo/bar/lib/cups -- -
The ServerBin directive sets the directory for
-server-run executables. If an absolute path is not provided then
-it is assumed to be relative to the ServerRoot directory. The
-default executable directory is /usr/lib/cups,
-/usr/lib32/cups, or /usr/libexec/cups
-depending on the operating system.
-ServerCertificate /etc/cups/ssl/server.crt -- -
The ServerCertificate directive specifies the
-location of the SSL certificate file used by the server when
-negotiating encrypted connections. The certificate must not be
-encrypted (password protected) since the scheduler normally runs
-in the background and will be unable to ask for a password.
The default certificate file is -/etc/cups/ssl/server.crt.
- - --ServerKey /etc/cups/ssl/server.key -- -
The ServerKey directive specifies the location of
-the SSL private key file used by the server when negotiating
-encrypted connections.
The default key file is -/etc/cups/ssl/server.crt.
- --ServerRoot /etc/cups -ServerRoot /foo/bar/cups -- -
The ServerRoot directive specifies the absolute
-path to the server configuration and state files. It is also used
-to resolve relative paths in the cupsd.conf file. The
-default server directory is /etc/cups.
Policy section.
--SystemGroup lpadmin -SystemGroup sys -SystemGroup system -SystemGroup root -SystemGroup root lpadmin -- -
The SystemGroup directive specifies the system
-administration group for System authentication.
-Multiple groups can be listed, separated with spaces. The default
-group list is @CUPS_SYSTEM_GROUPS@.
-TempDir /var/tmp -TempDir /foo/bar/tmp -- -
The TempDir directive specifies an absolute path
-for the directory to use for temporary files. The default
-directory is @CUPS_REQUESTS@/tmp.
Temporary directories must be world-writable and should have -the "sticky" permission bit enabled so that other users cannot -delete filter temporary files. The following commands will create -an appropriate temporary directory called -/foo/bar/tmp:
- --mkdir /foo/bar/tmp -chmod a+rwxt /foo/bar/tmp -- -
The default is @CUPS_USE_NETWORK_DEFAULT@.
-User lp -User guest -- -
The User directive specifies the UNIX user that
-filter and CGI programs run as. The default user is
-@CUPS_USER@.
Note: - -- -You may not use user
- -root, as that would expose -the system to unacceptable security risks. The scheduler will -automatically choose usernobodyif you specify a -user whose ID is 0.
The /etc/cups/cups-files.conf file contains configuration directives that control the files, directories. users. and groups that are used by the CUPS scheduler, cupsd(8). Each directive is listed on a line by itself followed by its value. Comments are introduced using the number sign ("#") character at the beginning of a line.
+AccessLog /var/log/cups/access_log +AccessLog /var/log/cups/access_log-%s +AccessLog syslog ++ +
The AccessLog directive sets the name of the
+access log file. If the filename is not absolute then it is
+assumed to be relative to the ServerRoot directory. The
+access log file is stored in "common log format" and can be used
+by any web access reporting tool to generate a report on CUPS
+server activity.
The server name can be included in the filename by using
+%s in the name.
The special name "syslog" can be used to send the access +information to the system log instead of a plain file.
+ +The default access log file is +@CUPS_LOGDIR@/access_log.
+ + ++ConfigFilePerm 0644 +ConfigFilePerm 0640 ++ +
The ConfigFilePerm directive specifies the permissions to use when the scheduler writes configuration and cache files, typically in response to IPP or HTTP requests. The default is @CUPS_CONFIG_FILE_PERM@.
Note: + ++ + +The permissions for the printers.conf file are always masked to only allow access from the scheduler user (typically root). This is done because printer device URIs sometimes contain sensitive authentication information that should not be generally known on the system. There is no way to disable this security feature.
+ +
+DataDir /usr/share/cups ++ +
The DataDir directive sets the directory to use
+for data files.
+DocumentRoot /usr/share/doc/cups +DocumentRoot /foo/bar/doc/cups ++ +
The DocumentRoot directive specifies the location
+of web content for the HTTP server in CUPS. If an absolute path
+is not specified then it is assumed to be relative to the ServerRoot directory. The
+default directory is @CUPS_DOCROOT@.
Documents are first looked up in a sub-directory for the
+primary language requested by the client (e.g.
+@CUPS_DOCROOT@/fr/...) and then directly under
+the DocumentRoot directory (e.g.
+@CUPS_DOCROOT@/...), so it is possible to
+localize the web content by providing subdirectories for each
+language needed.
+ErrorLog /var/log/cups/error_log +ErrorLog /var/log/cups/error_log-%s +ErrorLog syslog ++ +
The ErrorLog directive sets the name of the error
+log file. If the filename is not absolute then it is assumed to
+be relative to the ServerRoot directory. The
+default error log file is @CUPS_LOGDIR@/error_log.
The server name can be included in the filename by using
+%s in the name.
The special name "syslog" can be used to send the error +information to the system log instead of a plain file.
+ + ++FatalErrors none +FatalErrors all +FatalErrors browse +FatalErrors config +FatalErrors listen +FatalErrors log +FatalErrors permissions +FatalErrors all -permissions +FatalErrors config permissions log ++ +
The FatalErrors directive determines whether certain kinds of
+errors are fatal. The following kinds of errors are currently recognized:
none - No errors are fatalall - All of the errors below are fatalbrowse - Browsing initialization errors are fatal,
+ for example failed binding to the CUPS browse port or failed connections
+ to LDAP serversconfig - Configuration file syntax errors are
+ fatallisten - Listen or Port errors are fatal, except for
+ IPv6 failures on the loopback or "any" addresseslog - Log file creation or write errors are fatalpermissions - Bad startup file permissions are
+ fatal, for example shared SSL certificate and key files with world-
+ read permissionsMultiple errors can be listed, and the form "-kind" can be used with
+all to remove specific kinds of errors. The default setting is
+@CUPS_FATAL_ERRORS@.
+FileDevice Yes +FileDevice No ++ +
The FileDevice directive determines whether the
+scheduler allows new printers to be added using device URIs of
+the form file:/filename. File devices are most often
+used to test new printer drivers and do not support raw file
+printing.
The default setting is No.
Note: + ++ + +File devices are managed by the scheduler. Since the +scheduler normally runs as the root user, file devices +can be used to overwrite system files and potentially +gain unauthorized access to the system. If you must +create printers using file devices, we recommend that +you set the
+ +FileDevicedirective to +Yesfor only as long as you need to add the +printers to the system, and then reset the directive to +No.
+FontPath /foo/bar/fonts +FontPath /usr/share/cups/fonts:/foo/bar/fonts ++ +
The FontPath directive specifies the font path to
+use when searching for fonts. The default font path is
+/usr/share/cups/fonts.
+Group lp +Group nobody ++ +
The Group directive specifies the UNIX group that
+filter and CGI programs run as. The default group is
+system-specific but is usually lp or
+nobody.
+LogFilePerm 0644 +LogFilePerm 0600 ++ +
The LogFilePerm directive specifies the
+permissions to use when writing log files. The default
+is @CUPS_LOG_FILE_PERM@.
+PageLog /var/log/cups/page_log +PageLog /var/log/cups/page_log-%s +PageLog syslog ++ +
The PageLog directive sets the name of the page
+log file. If the filename is not absolute then it is assumed to
+be relative to the ServerRoot directory. The
+default page log file is @CUPS_LOGDIR@/page_log.
The server name can be included in the filename by using
+%s in the name.
The special name "syslog" can be used to send the page +information to the system log instead of a plain file.
+ + ++Printcap +Printcap /etc/printcap +Printcap /etc/printers.conf +Printcap /Library/Preferences/org.cups.printers.plist ++ +
The Printcap directive controls whether or not a
+printcap file is automatically generated and updated with a list
+of available printers. If specified with no value, then no
+printcap file will be generated. The default is to generate a
+file named @CUPS_DEFAULT_PRINTCAP@.
When a filename is specified (e.g. @CUPS_DEFAULT_PRINTCAP@), +the printcap file is written whenever a printer is added or +removed. The printcap file can then be used by applications that +are hardcoded to look at the printcap file for the available +printers.
+ + ++PrintcapFormat BSD +PrintcapFormat Solaris +PrintcapFormat plist ++ +
The PrintcapFormat directive controls the output format of the
+printcap file. The default is to generate the plist format on OS X, the
+Solaris format on Solaris, and the BSD format on other operating systems.
+RemoteRoot remroot +RemoteRoot root ++ +
The RemoteRoot directive sets the username for
+unauthenticated root requests from remote hosts. The default
+username is remroot. Setting RemoteRoot
+to root effectively disables this security
+mechanism.
+RequestRoot /var/spool/cups +RequestRoot /foo/bar/spool/cups ++ +
The RequestRoot directive sets the directory for
+incoming IPP requests and HTML forms. If an absolute path is not
+provided then it is assumed to be relative to the ServerRoot directory. The
+default request directory is @CUPS_REQUESTS@.
+ServerBin /usr/lib/cups +ServerBin /foo/bar/lib/cups ++ +
The ServerBin directive sets the directory for
+server-run executables. If an absolute path is not provided then
+it is assumed to be relative to the ServerRoot directory. The
+default executable directory is /usr/lib/cups,
+/usr/lib32/cups, or /usr/libexec/cups
+depending on the operating system.
+ServerCertificate /etc/cups/ssl/server.crt ++ +
The ServerCertificate directive specifies the
+location of the SSL certificate file used by the server when
+negotiating encrypted connections. The certificate must not be
+encrypted (password protected) since the scheduler normally runs
+in the background and will be unable to ask for a password.
The default certificate file is +/etc/cups/ssl/server.crt.
+ + ++ServerKey /etc/cups/ssl/server.key ++ +
The ServerKey directive specifies the location of
+the SSL private key file used by the server when negotiating
+encrypted connections.
The default key file is +/etc/cups/ssl/server.crt.
+ + ++ServerRoot /etc/cups +ServerRoot /foo/bar/cups ++ +
The ServerRoot directive specifies the absolute
+path to the server configuration and state files. It is also used
+to resolve relative paths in the cupsd.conf file. The
+default server directory is /etc/cups.
+SystemGroup lpadmin +SystemGroup sys +SystemGroup system +SystemGroup root +SystemGroup root lpadmin ++ +
The SystemGroup directive specifies the system
+administration group for System authentication.
+Multiple groups can be listed, separated with spaces. The default
+group list is @CUPS_SYSTEM_GROUPS@.
+TempDir /var/tmp +TempDir /foo/bar/tmp ++ +
The TempDir directive specifies an absolute path
+for the directory to use for temporary files. The default
+directory is @CUPS_REQUESTS@/tmp.
Temporary directories must be world-writable and should have +the "sticky" permission bit enabled so that other users cannot +delete filter temporary files. The following commands will create +an appropriate temporary directory called +/foo/bar/tmp:
+ ++mkdir /foo/bar/tmp +chmod a+rwxt /foo/bar/tmp ++ + +
+User lp +User guest ++ +
The User directive specifies the UNIX user that
+filter and CGI programs run as. The default user is
+@CUPS_USER@.
Note: + ++ + + + diff -up cups-1.5.4/doc/Makefile.str4223 cups-1.5.4/doc/Makefile --- cups-1.5.4/doc/Makefile.str4223 2011-01-17 05:40:28.000000000 +0000 +++ cups-1.5.4/doc/Makefile 2012-12-06 12:52:04.945832647 +0000 @@ -3,7 +3,7 @@ # # Documentation makefile for CUPS. # -# Copyright 2007-2011 by Apple Inc. +# Copyright 2007-2012 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -105,6 +105,7 @@ HELPFILES = \ help/ref-classes-conf.html \ help/ref-client-conf.html \ help/ref-cupsd-conf.html \ + help/ref-cups-files-conf.html \ help/ref-error_log.html \ help/ref-mailto-conf.html \ help/ref-page_log.html \ diff -up cups-1.5.4/locale/cups_da.po.str4223 cups-1.5.4/locale/cups_da.po --- cups-1.5.4/locale/cups_da.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_da.po 2012-12-06 12:52:23.562877028 +0000 @@ -2759,7 +2759,7 @@ msgstr "Arkivmappe - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7066,10 +7066,10 @@ msgstr "variable-bindings bruger uendeli #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Arkivets enheds-URI'er er blevet slået fra! Du slår det til ved at se i " -#~ "FileDevice-direktivet i \"%s/cupsd.conf\"." +#~ "FileDevice-direktivet i \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Fixertemperatur høj!" diff -up cups-1.5.4/locale/cups_de.po.str4223 cups-1.5.4/locale/cups_de.po --- cups-1.5.4/locale/cups_de.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_de.po 2012-12-06 12:52:23.576877070 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dateiordner – 9/16 x 3 7/16 Zo #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7104,10 +7104,10 @@ msgstr "variable-bindings hat unbestimmt #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Dateigeräte-URIs wurden deaktiviert! Infos zum Aktivieren finden Sie im " -#~ "FileDevice-Verzeichnis unter „%s/cupsd.conf“." +#~ "FileDevice-Verzeichnis unter „%s/cups-files.conf“." #~ msgid "Fuser temperature high!" #~ msgstr "Die Temperatur des Fixierers ist zu hoch!" diff -up cups-1.5.4/locale/cups_es.po.str4223 cups-1.5.4/locale/cups_es.po --- cups-1.5.4/locale/cups_es.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_es.po 2012-12-06 12:52:23.585877097 +0000 @@ -2991,10 +2991,10 @@ msgstr "Carpeta de archivosr - 9/16 x 3 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" "Los URIs del dispositivo de archivo han sido deshabilitados. Para " -"habilitarlos, vea la directiva FileDevice en \"%s/cupsd.conf\"." +"habilitarlos, vea la directiva FileDevice en \"%s/cups-files.conf\"." #, c-format msgid "Finished page %d." diff -up cups-1.5.4/locale/cups_eu.po.str4223 cups-1.5.4/locale/cups_eu.po --- cups-1.5.4/locale/cups_eu.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_eu.po 2012-12-06 12:52:23.599877139 +0000 @@ -2793,7 +2793,7 @@ msgstr "Fitxategien karpeta - 9/16 x 3 7 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7181,10 +7181,10 @@ msgstr "'variable-bindings'-ek definitu #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Fitxategiaren gailuaren URIak desgaitu egin dira. Gaitzeko, ikus " -#~ "FileDevice direktiba \"%s/cupsd.conf\" fitxategian." +#~ "FileDevice direktiba \"%s/cups-files.conf\" fitxategian." #~ msgid "Fuser temperature high!" #~ msgstr "Fuser-aren tenperatura altua." diff -up cups-1.5.4/locale/cups_fi.po.str4223 cups-1.5.4/locale/cups_fi.po --- cups-1.5.4/locale/cups_fi.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_fi.po 2012-12-06 12:52:23.613877181 +0000 @@ -2759,7 +2759,7 @@ msgstr "Arkistokansio - 9/16 x 3 7/16 \" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7070,10 +7070,10 @@ msgstr "variable-bindings käyttää mä #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Tiedostolaitteiden osoitteet on poistettu käytöstä! Voit ottaa ne " -#~ "käyttöön ”%s/cupsd.conf”-tiedoston FileDevice-säännöllä." +#~ "käyttöön ”%s/cups-files.conf”-tiedoston FileDevice-säännöllä." #~ msgid "Fuser temperature high!" #~ msgstr "Lämpövastuksen lämpötila on korkea!" diff -up cups-1.5.4/locale/cups_fr.po.str4223 cups-1.5.4/locale/cups_fr.po --- cups-1.5.4/locale/cups_fr.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_fr.po 2012-12-06 12:52:23.627877223 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dossier de fichier - 9/16 x 3 7/ #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7117,10 +7117,10 @@ msgstr "variable-bindings s’avère êt #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Les URI des périphériques de fichier ont été désactivés. Pour l’activer, " -#~ "reportez-vous à la directive FileDevice dans « %s/cupsd.conf »." +#~ "reportez-vous à la directive FileDevice dans « %s/cups-files.conf »." #~ msgid "Fuser temperature high!" #~ msgstr "Température de l’unité-fusible élevée." diff -up cups-1.5.4/locale/cups_hu.po.str4223 cups-1.5.4/locale/cups_hu.po --- cups-1.5.4/locale/cups_hu.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_hu.po 2012-12-06 12:52:23.637877253 +0000 @@ -2963,10 +2963,10 @@ msgstr "Fájlmappa - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" "A fájl eszközök URI-címei le lettek tiltva. Az engedélyezéshez lásd a " -"FileDevice direktívát a(z) „%s/cupsd.conf” fájlban." +"FileDevice direktívát a(z) „%s/cups-files.conf” fájlban." #, c-format msgid "Finished page %d." diff -up cups-1.5.4/locale/cups_id.po.str4223 cups-1.5.4/locale/cups_id.po --- cups-1.5.4/locale/cups_id.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_id.po 2012-12-06 12:52:23.651877295 +0000 @@ -2791,7 +2791,7 @@ msgstr "Map - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7011,10 +7011,10 @@ msgstr "variable-bindings memiliki panja #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Berkas URI perangkat telah dinonaktifkan! Untuk mengaktifkannya, lihatlah " -#~ "petunjuk FileDevice dalam \"%s/cupsd.conf\"." +#~ "petunjuk FileDevice dalam \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Suhu fusi tinggi!" diff -up cups-1.5.4/locale/cups_it.po.str4223 cups-1.5.4/locale/cups_it.po --- cups-1.5.4/locale/cups_it.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_it.po 2012-12-06 12:52:23.665877337 +0000 @@ -2761,7 +2761,7 @@ msgstr "Cartella documento: 9/16 x 3 7/1 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7160,10 +7160,10 @@ msgstr "variable-bindings utilizza una l #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Gli URI del dispositivo documento sono stati disabilitati! Per " -#~ "abilitarli, consulta l'istruzione del FileDevice in \"%s/cupsd.conf\"." +#~ "abilitarli, consulta l'istruzione del FileDevice in \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Temperatura del fusibile elevata!" diff -up cups-1.5.4/locale/cups_ja.po.str4223 cups-1.5.4/locale/cups_ja.po --- cups-1.5.4/locale/cups_ja.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_ja.po 2012-12-06 12:52:23.679877379 +0000 @@ -2788,7 +2788,7 @@ msgstr "ファイルフォルダー - 9/ #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7155,9 +7155,9 @@ msgstr "variable-bindings の長さが #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" -#~ "ファイルデバイス URI は無効になっています! 有効にするには、\"%s/cupsd.conf" +#~ "ファイルデバイス URI は無効になっています! 有効にするには、\"%s/cups-files.conf" #~ "\" の FileDevice ディレクティブを参照してください。" #~ msgid "Fuser temperature high!" diff -up cups-1.5.4/locale/cups_ko.po.str4223 cups-1.5.4/locale/cups_ko.po --- cups-1.5.4/locale/cups_ko.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_ko.po 2012-12-06 12:52:23.692877418 +0000 @@ -2759,7 +2759,7 @@ msgstr "파일 폴더 - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7043,9 +7043,9 @@ msgstr "variable-bindings의 길이가 #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" -#~ "파일 장비 URI가 비활성화되었습니다! 활성화하려면, \"%s/cupsd.conf\"에 있" +#~ "파일 장비 URI가 비활성화되었습니다! 활성화하려면, \"%s/cups-files.conf\"에 있" #~ "는 FileDevice 지시문을 보십시오." #~ msgid "Fuser temperature high!" diff -up cups-1.5.4/locale/cups_nl.po.str4223 cups-1.5.4/locale/cups_nl.po --- cups-1.5.4/locale/cups_nl.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_nl.po 2012-12-06 12:52:23.706877460 +0000 @@ -2760,7 +2760,7 @@ msgstr "Dossiermap - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7096,10 +7096,10 @@ msgstr "onbepaalde lengte gebruikt voor #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "File device-URI&aops;s zijn uitgeschakeld! Raadpleeg als u de URI&aops;s " -#~ "weer wilt inschakelen de richtlijn voor FileDevice in \"%s/cupsd.conf\"." +#~ "weer wilt inschakelen de richtlijn voor FileDevice in \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Fusertemperatuur te hoog!" diff -up cups-1.5.4/locale/cups_no.po.str4223 cups-1.5.4/locale/cups_no.po --- cups-1.5.4/locale/cups_no.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_no.po 2012-12-06 12:52:23.719877498 +0000 @@ -2759,7 +2759,7 @@ msgstr "Filmappe – 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7044,10 +7044,10 @@ msgstr "variable-bindings bruker uendeli #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Enhets-URIer for filer er deaktivert! Hvis du vil aktivere funksjonen, " -#~ "leser du FileDevice-direktivet i «%s/cupsd.conf»." +#~ "leser du FileDevice-direktivet i «%s/cups-files.conf»." #~ msgid "Fuser temperature high!" #~ msgstr "Fikseringsenhetens temperatur er høy!" diff -up cups-1.5.4/locale/cups_pl.po.str4223 cups-1.5.4/locale/cups_pl.po --- cups-1.5.4/locale/cups_pl.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_pl.po 2012-12-06 12:52:23.733877540 +0000 @@ -2759,7 +2759,7 @@ msgstr "Folder - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7080,10 +7080,10 @@ msgstr "variable-bindings używa niesko #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "URI pliku urządzenia zostało wyłączone! Aby włączyć, zobacz dyrektywę " -#~ "FileDevice w \"%s/cupsd.conf\"." +#~ "FileDevice w \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Wysoka temperatura wygrzewacza!" diff -up cups-1.5.4/locale/cups_pt_BR.po.str4223 cups-1.5.4/locale/cups_pt_BR.po --- cups-1.5.4/locale/cups_pt_BR.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_pt_BR.po 2012-12-06 12:52:23.747877582 +0000 @@ -2759,7 +2759,7 @@ msgstr "Pasta de Arquivo - 9/16 x 3 7/16 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7085,10 +7085,10 @@ msgstr "variable-bindings usa compriment #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "URIs de dispositivo de arquivo foram desativados! Para ativá-los, " -#~ "consulte a diretiva FileDevice em \"%s/cupsd.conf\"." +#~ "consulte a diretiva FileDevice em \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Temperatura do fuser alta!" diff -up cups-1.5.4/locale/cups_pt.po.str4223 cups-1.5.4/locale/cups_pt.po --- cups-1.5.4/locale/cups_pt.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_pt.po 2012-12-06 12:52:23.760877621 +0000 @@ -2759,7 +2759,7 @@ msgstr "Pasta de ficheiros - 9/16 x 3 7/ #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7081,10 +7081,10 @@ msgstr "variable-bindings com compriment #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "URIs do periférico do ficheiro foram desactivados! Para activar, consulte " -#~ "a directiva FileDevice em \"%s/cupsd.conf\"." +#~ "a directiva FileDevice em \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Temperatura do fusor elevada!" diff -up cups-1.5.4/locale/cups_ru.po.str4223 cups-1.5.4/locale/cups_ru.po --- cups-1.5.4/locale/cups_ru.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_ru.po 2012-12-06 12:52:23.774877663 +0000 @@ -2759,7 +2759,7 @@ msgstr "Каталог файла - 9 16 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7060,10 +7060,10 @@ msgstr "Для variable-bindings дли #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "URI-адреса файлового устройства отключены! Чтобы включить их, используйте " -#~ "директиву FileDevice в «%s/cupsd.conf»." +#~ "директиву FileDevice в «%s/cups-files.conf»." #~ msgid "Fuser temperature high!" #~ msgstr "Высокая температура термофиксатора!" diff -up cups-1.5.4/locale/cups_sv.po.str4223 cups-1.5.4/locale/cups_sv.po --- cups-1.5.4/locale/cups_sv.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_sv.po 2012-12-06 12:52:23.787877702 +0000 @@ -2759,7 +2759,7 @@ msgstr "Filmapp - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7056,10 +7056,10 @@ msgstr "variabelbindningar använder obe #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" #~ "Filenhets URI:er har blivit avaktiverade! För att aktivera, se direktivet " -#~ "FileDevice i \"%s/cupsd.conf\"." +#~ "FileDevice i \"%s/cups-files.conf\"." #~ msgid "Fuser temperature high!" #~ msgstr "Hög fixeringstemperatur!" diff -up cups-1.5.4/locale/cups_zh.po.str4223 cups-1.5.4/locale/cups_zh.po --- cups-1.5.4/locale/cups_zh.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_zh.po 2012-12-06 12:52:23.801877744 +0000 @@ -2758,7 +2758,7 @@ msgstr "文件夹 - 9/16 x 3 7/16 英寸 #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7010,9 +7010,9 @@ msgstr "variable-bindings 使用不定 #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" -#~ "文件设备 URI 已被停用！要启用，请参阅“%s/cupsd.conf”中的 FileDevice 指令。" +#~ "文件设备 URI 已被停用！要启用，请参阅“%s/cups-files.conf”中的 FileDevice 指令。" #~ msgid "Fuser temperature high!" #~ msgstr "加热鼓温度过高！" diff -up cups-1.5.4/locale/cups_zh_TW.po.str4223 cups-1.5.4/locale/cups_zh_TW.po --- cups-1.5.4/locale/cups_zh_TW.po.str4223 2012-03-07 21:38:28.000000000 +0000 +++ cups-1.5.4/locale/cups_zh_TW.po 2012-12-06 12:52:23.814877783 +0000 @@ -2758,7 +2758,7 @@ msgstr "檔案夾 - 9/16 x 3 7/16\"" #, c-format msgid "" "File device URIs have been disabled. To enable, see the FileDevice directive " -"in \"%s/cupsd.conf\"." +"in \"%s/cups-files.conf\"." msgstr "" #, c-format @@ -7012,9 +7012,9 @@ msgstr "variable-bindings 使用的長 #~ msgid "" #~ "File device URIs have been disabled! To enable, see the FileDevice " -#~ "directive in \"%s/cupsd.conf\"." +#~ "directive in \"%s/cups-files.conf\"." #~ msgstr "" -#~ "已停用檔案設備 URI！若要啟用，請參閱“%s/cupsd.conf”中的 FileDevice 指示。" +#~ "已停用檔案設備 URI！若要啟用，請參閱“%s/cups-files.conf”中的 FileDevice 指示。" #~ msgid "Fuser temperature high!" #~ msgstr "加熱器溫度高！" diff -up cups-1.5.4/man/cupsctl.man.str4223 cups-1.5.4/man/cupsctl.man --- cups-1.5.4/man/cupsctl.man.str4223 2011-01-11 03:04:04.000000000 +0000 +++ cups-1.5.4/man/cupsctl.man 2013-03-05 14:56:43.496345943 +0000 @@ -12,7 +12,7 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH cupsctl 8 "CUPS" "10 January 2011" "Apple Inc." +.TH cupsctl 8 "CUPS" "12 December 2012" "Apple Inc." .SH NAME cupsctl \- configure cupsd.conf options .SH SYNOPSIS @@ -89,11 +89,6 @@ Disable printer sharing: .nf cupsctl --no-shared-printers .fi -.LP -Enable printing using the file: pseudo-device: -.nf - cupsctl FileDevice=Yes -.fi .SH KNOWN ISSUES You cannot set the Listen or Port directives using \fIcupsctl\fR. .SH SEE ALSO diff -up cups-1.5.4/man/cupsd.conf.man.in.str4223 cups-1.5.4/man/cupsd.conf.man.in --- cups-1.5.4/man/cupsd.conf.man.in.str4223 2011-05-18 22:33:35.000000000 +0100 +++ cups-1.5.4/man/cupsd.conf.man.in 2012-12-06 12:52:04.946832650 +0000 @@ -12,12 +12,15 @@ .\" which should have been included with this file. If this file is .\" file is missing or damaged, see the license at "http://www.cups.org/". .\" -.TH cupsd.conf 5 "CUPS" "18 May 2011" "Apple Inc." +.TH cupsd.conf 5 "CUPS" "19 November 2012" "Apple Inc." .SH NAME cupsd.conf \- server configuration file for cups .SH DESCRIPTION The \fIcupsd.conf\fR file configures the CUPS scheduler, \fIcupsd(8)\fR. It -is normally located in the \fI@CUPS_SERVERROOT@\fR directory. +is normally located in the \fI@CUPS_SERVERROOT@\fR directory. \fBNote:\fR +File, directory, and user configuration directives that used to be allowed in +the \fIcupsd.conf\fR file are now stored in the \fIcups-files.conf(5)\fR 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. Comment lines start with the # character. The @@ -27,12 +30,6 @@ popular Apache web server software and a The following directives are understood by \fIcupsd(8)\fR. Consult the on-line help for detailed descriptions: .TP 5 -AccessLog filename -.TP 5 -AccessLog syslog -.br -Defines the access log filename. -.TP 5 AccessLogLevel config .TP 5 AccessLogLevel actions @@ -61,20 +58,6 @@ Allow @LOCAL .br Allows access from the named hosts or addresses. .TP 5 -AuthClass User -.TP 5 -AuthClass Group -.TP 5 -AuthClass System -.br -Specifies the authentication class (User, Group, System) - -\fBthis directive is deprecated\fR. -.TP 5 -AuthGroupName group-name -.br -Specifies the authentication group - \fBthis directive is -deprecated\fR. -.TP 5 AuthType None .TP 5 AuthType Basic @@ -220,7 +203,7 @@ Browsing Yes .TP 5 Browsing No .br -Specifies whether or not remote printer browsing should be enabled. +Specifies whether or not shared printers should be advertised. .TP 5 Classification banner .br @@ -233,15 +216,6 @@ ClassifyOverride No Specifies whether to allow users to override the classification of individual print jobs. .TP 5 -ConfigFilePerm mode -.br -Specifies the permissions for all configuration files that the scheduler -writes. -.TP 5 -DataDir path -.br -Specified the directory where data files can be found. -.TP 5 DefaultAuthType Basic .TP 5 DefaultAuthType BasicDigest @@ -309,10 +283,6 @@ Specifies the delay for updating of conf causes the update to happen as soon as possible, typically within a few milliseconds. .TP 5 -DocumentRoot directory -.br -Specifies the root directory for the internal web server documents. -.TP 5 Encryption IfRequested .TP 5 Encryption Never @@ -322,28 +292,6 @@ Encryption Required Specifies the level of encryption that is required for a particular location. .TP 5 -ErrorLog filename -.TP 5 -ErrorLog syslog -.br -Specifies the error log filename. -.TP 5 -FatalErrors none -.TP 5 -FatalErrors all -kind [... -kind] -.TP 5 -FatalErrors kind [... kind] -.br -Specifies which errors are fatal, causing the scheduler to exit. "Kind" is -"browse", "config", "listen", "log", or "permissions". -.TP 5 -FileDevice Yes -.TP 5 -FileDevice No -.br -Specifies whether the file pseudo-device can be used for new -printer queues. -.TP 5 FilterLimit limit .br Specifies the maximum cost of filters that are run concurrently. @@ -353,15 +301,6 @@ FilterNice nice-value Specifies the scheduling priority ("nice" value) of filters that are run to print a job. .TP 5 -FontPath directory[:directory:...] -.br -Specifies the search path for fonts. -.TP 5 -Group group-name-or-number -.br -Specifies the group name or ID that will be used when executing -external programs. -.TP 5 HideImplicitMembers Yes .TP 5 HideImplicitMembers No @@ -469,10 +408,6 @@ LogDebugHistory #-messages Specifies the number of debugging messages that are logged when an error occurs in a print job. .TP 5 -LogFilePerm mode -.br -Specifies the permissions for all log files that the scheduler writes. -.TP 5 LogLevel alert .TP 5 LogLevel crit @@ -546,12 +481,6 @@ Order deny,allow .br Specifies the order of HTTP access control (allow,deny or deny,allow) .TP 5 -PageLog filename -.TP 5 -PageLog syslog -.br -Specifies the page log filename. -.TP 5 PageLogFormat format string .br Specifies the format of page log lines. @@ -581,15 +510,6 @@ PreserveJobHistory No Specifies whether or not to preserve the job history after they are printed. .TP 5 -Printcap -.TP 5 -Printcap filename -.br -Specifies the filename for a printcap file that is updated -automatically with a list of available printers (needed for -legacy applications); specifying Printcap with no filename -disables printcap generation. -.TP 5 PrintcapFormat bsd .TP 5 PrintcapFormat plist @@ -598,29 +518,11 @@ PrintcapFormat solaris .br Specifies the format of the printcap file. .TP 5 -PrintcapGUI -.TP 5 -PrintcapGUI gui-program-filename -.br -Specifies whether to generate option panel definition files on -some operating systems. When provided with no program filename, -disables option panel definition files. -.TP 5 ReloadTimeout seconds .br Specifies the amount of time to wait for job completion before restarting the scheduler. .TP 5 -RemoteRoot user-name -.br -Specifies the username that is associated with unauthenticated root -accesses. -.TP 5 -RequestRoot directory -.br -Specifies the directory to store print jobs and other HTTP request -data. -.TP 5 Require group group-name-list .TP 5 Require user user-name-list @@ -652,27 +554,10 @@ ServerAlias * Specifies an alternate name that the server is known by. The special name "*" allows any name to be used. .TP 5 -ServerBin directory -.br -Specifies the directory where backends, CGIs, daemons, and filters may -be found. -.TP 5 -ServerCertificate filename -.br -Specifies the encryption certificate to use. -.TP 5 -ServerKey filename -.br -Specifies the encryption key to use. -.TP 5 ServerName hostname-or-ip-address .br Specifies the fully-qualified hostname of the server. .TP 5 -ServerRoot directory -.br -Specifies the directory where the server configuration files can be found. -.TP 5 ServerTokens Full .TP 5 ServerTokens Major @@ -729,29 +614,17 @@ Specifies the list of job values to make "notify-events", "notify-pull-method", "notify-recipient-uri", "notify-subscriber-user-name", and "notify-user-data". .TP 5 -SystemGroup group-name [group-name ...] -.br -Specifies the group(s) to use for System class authentication. -.TP 5 -TempDir directory -.br -Specifies the directory where temporary files are stored. -.TP 5 Timeout seconds .br Specifies the HTTP request timeout in seconds. .TP 5 -User user-name -.br -Specifies the user name or ID that is used when running external programs. -.TP 5 WebInterface yes .TP 5 WebInterface no Specifies whether the web interface is enabled. .SH SEE ALSO -\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fImime.convs(5)\fR, -\fImime.types(5)\fR, \fIprinters.conf(5)\fR, +\fIclasses.conf(5)\fR, \fIcups-files.conf(5)\fR, \fIcupsd(8)\fR, +\fImime.convs(5)\fR, \fImime.types(5)\fR, \fIprinters.conf(5)\fR, \fIsubscriptions.conf(5)\fR, .br http://localhost:631/help diff -up cups-1.5.4/man/cups-files.conf.man.in.str4223 cups-1.5.4/man/cups-files.conf.man.in --- cups-1.5.4/man/cups-files.conf.man.in.str4223 2012-12-06 12:52:04.946832650 +0000 +++ cups-1.5.4/man/cups-files.conf.man.in 2012-12-06 12:52:04.946832650 +0000 @@ -0,0 +1,146 @@ +.\" +.\" "$Id$" +.\" +.\" cupsd.conf man page for CUPS. +.\" +.\" Copyright 2007-2012 by Apple Inc. +.\" Copyright 1997-2006 by Easy Software Products. +.\" +.\" These coded instructions, statements, and computer programs are the +.\" property of Apple Inc. and are protected by Federal copyright +.\" law. Distribution and use rights are outlined in the file "LICENSE.txt" +.\" which should have been included with this file. If this file is +.\" file is missing or damaged, see the license at "http://www.cups.org/". +.\" +.TH cups-files.conf 5 "CUPS" "19 November 2012" "Apple Inc." +.SH NAME +cups-files.conf \- file and directory configuration file for cups +.SH DESCRIPTION +The \fIcups-file.conf\fR file configures the files and directories used by the +CUPS scheduler, \fIcupsd(8)\fR. It is normally located in the +\fI@CUPS_SERVERROOT@\fR directory. +.LP +Each line in the file can be a configuration directive, a blank line, +or a comment. Comment lines start with the # character. +.SH DIRECTIVES +The following directives are understood by \fIcupsd(8)\fR. Consult the +on-line help for detailed descriptions: +.TP 5 +AccessLog filename +.TP 5 +AccessLog syslog +.br +Defines the access log filename. +.TP 5 +ConfigFilePerm mode +.br +Specifies the permissions for all configuration files that the scheduler +writes. +.TP 5 +DataDir path +.br +Specified the directory where data files can be found. +.TP 5 +DocumentRoot directory +.br +Specifies the root directory for the internal web server documents. +.TP 5 +ErrorLog filename +.TP 5 +ErrorLog syslog +.br +Specifies the error log filename. +.TP 5 +FatalErrors none +.TP 5 +FatalErrors all -kind [... -kind] +.TP 5 +FatalErrors kind [... kind] +.br +Specifies which errors are fatal, causing the scheduler to exit. "Kind" is +"browse", "config", "listen", "log", or "permissions". +.TP 5 +FileDevice Yes +.TP 5 +FileDevice No +.br +Specifies whether the file pseudo-device can be used for new +printer queues. +.TP 5 +FontPath directory[:directory:...] +.br +Specifies the search path for fonts. +.TP 5 +Group group-name-or-number +.br +Specifies the group name or ID that will be used when executing +external programs. +.TP 5 +LogFilePerm mode +.br +Specifies the permissions for all log files that the scheduler writes. +.TP 5 +PageLog filename +.TP 5 +PageLog syslog +.br +Specifies the page log filename. +.TP 5 +Printcap +.TP 5 +Printcap filename +.br +Specifies the filename for a printcap file that is updated +automatically with a list of available printers (needed for +legacy applications); specifying Printcap with no filename +disables printcap generation. +.TP 5 +RemoteRoot user-name +.br +Specifies the username that is associated with unauthenticated root +accesses. +.TP 5 +RequestRoot directory +.br +Specifies the directory to store print jobs and other HTTP request +data. +.TP 5 +ServerBin directory +.br +Specifies the directory where backends, CGIs, daemons, and filters may +be found. +.TP 5 +ServerCertificate filename +.br +Specifies the encryption certificate to use. +.TP 5 +ServerKey filename +.br +Specifies the encryption key to use. +.TP 5 +ServerRoot directory +.br +Specifies the directory where the server configuration files can be found. +.TP 5 +SystemGroup group-name [group-name ...] +.br +Specifies the group(s) to use for System class authentication. +.TP 5 +TempDir directory +.br +Specifies the directory where temporary files are stored. +.TP 5 +User user-name +.br +Specifies the user name or ID that is used when running external programs. +.SH SEE ALSO +\fIclasses.conf(5)\fR, \fIcupsd(8)\fR, \fIcupsd.conf(5)\fR, \fImime.convs(5)\fR, +\fImime.types(5)\fR, \fIprinters.conf(5)\fR, +\fIsubscriptions.conf(5)\fR, +.br +http://localhost:631/help +.SH COPYRIGHT +Copyright 2007-2012 by Apple Inc. +.\" +.\" End of "$Id$". +.\" diff -up cups-1.5.4/man/Makefile.str4223 cups-1.5.4/man/Makefile --- cups-1.5.4/man/Makefile.str4223 2010-06-22 22:21:37.000000000 +0100 +++ cups-1.5.4/man/Makefile 2012-12-06 12:52:04.946832650 +0000 @@ -39,6 +39,7 @@ MAN1 = cancel.$(MAN1EXT) \ ppdpo.$(MAN1EXT) MAN5 = classes.conf.$(MAN5EXT) \ client.conf.$(MAN5EXT) \ + cups-files.conf.$(MAN5EXT) \ cups-snmp.conf.$(MAN5EXT) \ cupsd.conf.$(MAN5EXT) \ ipptoolfile.$(MAN5EXT) \ diff -up cups-1.5.4/packaging/cups.list.in.str4223 cups-1.5.4/packaging/cups.list.in --- cups-1.5.4/packaging/cups.list.in.str4223 2012-04-24 00:49:19.000000000 +0100 +++ cups-1.5.4/packaging/cups.list.in 2012-12-06 12:52:04.946832650 +0000 @@ -588,6 +588,7 @@ d 0755 root $CUPS_GROUP $SERVERROOT/inte d 0755 root $CUPS_GROUP $SERVERROOT/ppd - d 0700 root $CUPS_GROUP $SERVERROOT/ssl - c $CUPS_PERM root $CUPS_GROUP $SERVERROOT/ conf/*.conf +f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cups-files.conf.default conf/cups-files.conf f $CUPS_PERM root $CUPS_GROUP $SERVERROOT/cupsd.conf.default conf/cupsd.conf %if PAMDIR diff -up cups-1.5.4/packaging/cups.spec.in.str4223 cups-1.5.4/packaging/cups.spec.in --- cups-1.5.4/packaging/cups.spec.in.str4223 2012-04-23 18:46:53.000000000 +0100 +++ cups-1.5.4/packaging/cups.spec.in 2012-12-06 12:52:04.947832653 +0000 @@ -152,6 +152,7 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %dir /etc/cups %config(noreplace) /etc/cups/*.conf +/etc/cups/cups-files.conf.default /etc/cups/cupsd.conf.default %dir /etc/cups/interfaces %dir /etc/cups/ppd diff -up cups-1.5.4/scheduler/client.c.str4223 cups-1.5.4/scheduler/client.c --- cups-1.5.4/scheduler/client.c.str4223 2012-12-06 12:52:04.911832546 +0000 +++ cups-1.5.4/scheduler/client.c 2012-12-06 12:52:04.948832656 +0000 @@ -35,7 +35,7 @@ * data_ready() - Check whether data is available from a client. * encrypt_client() - Enable encryption for the client... * get_file() - Get a filename and state info. - * install_conf_file() - Install a configuration file. + * install_cupsd_conf() - Install a configuration file. * is_cgi() - Is the resource a CGI script/program? * is_path_absolute() - Is a path absolute and free of relative elements * (i.e. ".."). @@ -75,7 +75,7 @@ static int encrypt_client(cupsd_client_ #endif /* HAVE_SSL */ static char *get_file(cupsd_client_t *con, struct stat *filestats, char *filename, int len); -static http_status_t install_conf_file(cupsd_client_t *con); +static http_status_t install_cupsd_conf(cupsd_client_t *con); static int is_cgi(cupsd_client_t *con, const char *filename, struct stat *filestats, mime_type_t *type); static int is_path_absolute(const char *path); @@ -1685,17 +1685,14 @@ cupsdReadClient(cupsd_client_t *con) /* * Validate the resource name... */ - if (strncmp(con->uri, "/admin/conf/", 12) || - strchr(con->uri + 12, '/') || - strlen(con->uri) == 12) + if (strcmp(con->uri, "/admin/conf/cupsd.conf")) { /* - * PUT can only be done to configuration files under - * /admin/conf... + * PUT can only be done to the cupsd.conf file... */ cupsdLogMessage(CUPSD_LOG_ERROR, - "Request for subdirectory \"%s\"!", con->uri); + "Disallowed PUT request for \"%s\"!", con->uri); if (!cupsdSendError(con, HTTP_FORBIDDEN, CUPSD_AUTH_NONE)) { @@ -2059,7 +2056,7 @@ cupsdReadClient(cupsd_client_t *con) /* * Install the configuration file... */ - status = install_conf_file(con); + status = install_cupsd_conf(con); /* * Return the status to the client... @@ -3814,14 +3811,13 @@ get_file(cupsd_client_t *con, /* I - C /* - * 'install_conf_file()' - Install a configuration file. + * 'install_cupsd_conf()' - Install a configuration file. */ static http_status_t /* O - Status */ -install_conf_file(cupsd_client_t *con) /* I - Connection */ +install_cupsd_conf(cupsd_client_t *con) /* I - Connection */ { char filename[1024]; /* Configuration filename */ - mode_t mode; /* Permissions */ cups_file_t *in, /* Input file */ *out; /* Output file */ char buffer[16384]; /* Copy buffer */ @@ -3843,19 +3839,14 @@ install_conf_file(cupsd_client_t *con) / * Open the new config file... */ - snprintf(filename, sizeof(filename), "%s%s", ServerRoot, con->uri + 11); - if (!strcmp(con->uri, "/admin/conf/printers.conf")) - mode = ConfigFilePerm & 0600; - else - mode = ConfigFilePerm; - - if ((out = cupsdCreateConfFile(filename, mode)) == NULL) + if ((out = cupsdCreateConfFile(ConfigurationFile, ConfigFilePerm)) == NULL) { cupsFileClose(in); return (HTTP_SERVER_ERROR); } - cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", filename); + cupsdLogMessage(CUPSD_LOG_INFO, "Installing config file \"%s\"...", + ConfigurationFile); /* * Copy from the request to the new config file... @@ -3866,12 +3857,12 @@ install_conf_file(cupsd_client_t *con) / { cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to copy to config file \"%s\": %s", - filename, strerror(errno)); + ConfigurationFile, strerror(errno)); cupsFileClose(in); cupsFileClose(out); - snprintf(filename, sizeof(filename), "%s%s.N", ServerRoot, con->uri + 11); + snprintf(filename, sizeof(filename), "%s.N", ConfigurationFile); cupsdRemoveFile(filename); return (HTTP_SERVER_ERROR); @@ -3883,7 +3874,7 @@ install_conf_file(cupsd_client_t *con) / cupsFileClose(in); - if (cupsdCloseCreatedConfFile(out, filename)) + if (cupsdCloseCreatedConfFile(out, ConfigurationFile)) return (HTTP_SERVER_ERROR); /* @@ -3894,14 +3885,10 @@ install_conf_file(cupsd_client_t *con) / cupsdClearString(&con->filename); /* - * If the cupsd.conf file was updated, set the NeedReload flag... + * Set the NeedReload flag... */ - if (!strcmp(con->uri, "/admin/conf/cupsd.conf")) - NeedReload = RELOAD_CUPSD; - else - NeedReload = RELOAD_ALL; - + NeedReload = RELOAD_CUPSD; ReloadTime = time(NULL); /* diff -up cups-1.5.4/scheduler/conf.c.str4223 cups-1.5.4/scheduler/conf.c --- cups-1.5.4/scheduler/conf.c.str4223 2012-12-06 12:52:04.912832549 +0000 +++ cups-1.5.4/scheduler/conf.c 2012-12-06 12:52:04.949832659 +0000 @@ -27,7 +27,8 @@ * parse_fatal_errors() - Parse FatalErrors values in a string. * parse_groups() - Parse system group names in a string. * parse_protocols() - Parse browse protocols in a string. - * read_configuration() - Read a configuration file. + * read_cupsd_conf() - Read the cupsd.conf configuration file. + * read_cups_files_conf() - Read the cups-files.conf configuration file. * read_location() - Read aYou may not use user
+ +root, as that would expose +the system to unacceptable security risks. The scheduler will +automatically choose usernobodyif you specify a +user whose ID is 0.