The client.conf Server directive is no longer supported on Mac OS X 10.7 and

later.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@9958 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.5.txt b/CHANGES-1.5.txt
index aa03a35c365f169e003c4b09957695b455ca2dcb..b2808cf0e8de0103714c5c278356c57c80d6a6fb 100644 (file)
--- a/CHANGES-1.5.txt
+++ b/CHANGES-1.5.txt
@@ -4,6 +4,8 @@ CHANGES-1.5.txt
 CHANGES IN CUPS V1.5.1
 
        - Documentation updates (STR #3885)
+       - The client.conf Server directive is no longer supported on Mac OS X
+         10.7 and later.
        - The IPP backend sent the wrong margins in media-col.
        - The scheduler did not save or restore large Kerberos credentials for
          jobs.

diff --git a/cups/usersys.c b/cups/usersys.c
index 2772f7d536da2a7417a0b760905f67e50bddc487..0c6c9d70032241aa5f94987dd0286b049b9fa310 100644 (file)
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -658,12 +658,18 @@ cups_read_client_conf(
       strlcpy(encryption, value, sizeof(encryption));
       cups_encryption = encryption;
     }
+#ifndef __APPLE__
+   /*
+    * The Server directive is not supported on Mac OS X due to app sandboxing
+    * restrictions, i.e. not all apps request network access.
+    */
     else if (!cups_server && (!cg->server[0] || !cg->ipp_port) &&
              !_cups_strcasecmp(line, "ServerName") && value)
     {
       strlcpy(server_name, value, sizeof(server_name));
       cups_server = server_name;
     }
+#endif /* !__APPLE__ */
     else if (!cups_anyroot && !_cups_strcasecmp(line, "AllowAnyRoot") && value)
     {
       strlcpy(any_root, value, sizeof(any_root));

diff --git a/man/client.conf.man.in b/man/client.conf.man.in
index abcf3bcabebedd3e4f95b34e2dde7736c8a632d1..47195e9f1bf0c7c82187d5bba66de120cab317ac 100644 (file)
--- a/man/client.conf.man.in
+++ b/man/client.conf.man.in
@@ -12,11 +12,11 @@
 .\"   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 client.conf 5 "CUPS" "28 March 2011" "Apple Inc."
+.TH client.conf 5 "CUPS" "2 September 2011" "Apple Inc."
 .SH NAME
 client.conf \- client configuration file for cups
 .SH DESCRIPTION
-The \fIclient.conf\fR file configures the CUPS client and is 
+The \fIclient.conf\fR file configures the CUPS client and is
 normally located in the \fI@CUPS_SERVERROOT@\fR or \fI~/.cups\fR
 directory. Each line in the file can be a configuration
 directive, a blank line, or a comment. Comment lines start with
@@ -45,7 +45,7 @@ ServerName hostname-or-ip-address[:port]
 ServerName /domain/socket
 .br
 Specifies the address and optionally the port to use when connecting to the
-server.
+server. \fBNote: Not supported on Mac OS X 10.7 or later.\fR
 .SH SEE ALSO
 http://localhost:631/help
 .SH COPYRIGHT