From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Thu, 5 Dec 2013 19:51:58 +0000 (+0000)
Subject: Fix builds.
X-Git-Tag: v2.2b1~802
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4047845ec1c8be7e335c904a424a0b00c9364cb;p=thirdparty%2Fcups.git

Fix builds.

Fix tel: URIs (<rdar://problem/15418463>)


git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11444 a1ca3aef-8c08-0410-bb20-df032aa958be
---

diff --git a/cups/http-support.c b/cups/http-support.c
index bea6b7a79e..bec2683433 100644
--- a/cups/http-support.c
+++ b/cups/http-support.c
@@ -192,10 +192,10 @@ httpAssembleURI(
   if (!ptr)
     goto assemble_overflow;
 
-  if (!strcmp(scheme, "mailto"))
+  if (!strcmp(scheme, "mailto") || !strcmp(scheme, "tel"))
   {
    /*
-    * mailto: only has :, no //...
+    * mailto: and tel: only have :, no //...
     */
 
     if (ptr < end)
@@ -206,7 +206,7 @@ httpAssembleURI(
   else
   {
    /*
-    * Schemes other than mailto: all have //...
+    * Schemes other than mailto: and tel: all have //...
     */
 
     if ((ptr + 2) < end)
@@ -1059,7 +1059,7 @@ httpSeparateURI(
     *port = 515;
   else if (!strcmp(scheme, "socket"))	/* Not yet registered with IANA... */
     *port = 9100;
-  else if (strcmp(scheme, "file") && strcmp(scheme, "mailto"))
+  else if (strcmp(scheme, "file") && strcmp(scheme, "mailto") && strcmp(scheme, "tel"))
     status = HTTP_URI_STATUS_UNKNOWN_SCHEME;
 
  /*
diff --git a/cups/testhttp.c b/cups/testhttp.c
index a1fbc37aaf..a197a2e4b0 100644
--- a/cups/testhttp.c
+++ b/cups/testhttp.c
@@ -1,22 +1,18 @@
 /*
  * "$Id$"
  *
- *   HTTP test program for CUPS.
+ * HTTP test program for CUPS.
  *
- *   Copyright 2007-2013 by Apple Inc.
- *   Copyright 1997-2006 by Easy Software Products.
+ * Copyright 2007-2013 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/".
+ * 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/".
  *
- *   This file is subject to the Apple OS-Developed Software exception.
- *
- * Contents:
- *
- *   main() - Main entry.
+ * This file is subject to the Apple OS-Developed Software exception.
  */
 
 /*
@@ -105,6 +101,9 @@ static uri_test_t	uri_tests[] =	/* URI test data */
 			  { HTTP_URI_STATUS_OK, "socket://192.168.1.1:9101/",
 			    "socket", "", "192.168.1.1", "/", 9101, 9101,
 			    HTTP_URI_CODING_MOST  },
+			  { HTTP_URI_STATUS_OK, "tel:8005551212",
+			    "tel", "", "", "8005551212", 0, 0,
+			    HTTP_URI_CODING_MOST  },
 			  { HTTP_URI_STATUS_OK, "ipp://username:password@[v1.fe80::200:1234:5678:9abc+eth0]:999/ipp",
 			    "ipp", "username:password", "fe80::200:1234:5678:9abc%eth0", "/ipp", 999, 999,
 			    HTTP_URI_CODING_MOST  },
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c
index beb5e62eca..4dda4f2d3b 100644
--- a/cups/tls-darwin.c
+++ b/cups/tls-darwin.c
@@ -180,6 +180,13 @@ httpLoadCredentials(
     cups_array_t **credentials,		/* IO - Credentials */
     const char   *common_name)		/* I  - Common name for credentials */
 {
+  (void)path;
+  (void)credentials;
+  (void)common_name;
+
+  return (-1);
+
+#if 0
   OSStatus		err;		/* Error info */
   SecKeychainRef	keychain = NULL;/* Keychain reference */
   SecIdentitySearchRef	search = NULL;	/* Search reference */
@@ -246,33 +253,11 @@ httpLoadCredentials(
     CFRelease(query);
 
   return (certificates);
-
-}
-
-
-/*
- * 'httpLoadPEM()' - Load PEM-encoded credentials from separate files.
- *
- * @since CUPS 2.0@
- */
-
-int					/* O - 0 on success, -1 on error */
-httpLoadPEM(const char *certificate,	/* I - Certificate file */
-	    const char *private_key,	/* I - Private key file */
-            const char *chain,		/* I - Certificate chain file or @code NULL@ */
-	    cups_array_t **credentials)	/* O - Credentials */
-{
-  (void)certificate;
-  (void)private_key;
-  (void)chain;
-
-  if (credentials)
-    *credentials = NULL;
-
-  return (-1);
+#endif /* 0 */
 }
 
 
+#if 0
 /*
  * 'httpMakeCredentials()' - Create self-signed credentials for the given
  *                           name.
@@ -467,6 +452,7 @@ cleanup:
 
   return (httpLoadCredentials(path, credentials, common_name));
 }
+#endif /* 0 */
 
 
 /*
diff --git a/doc/help/man-cupsd.conf.html b/doc/help/man-cupsd.conf.html
index 227ccfe2fb..f900c3c452 100644
--- a/doc/help/man-cupsd.conf.html
+++ b/doc/help/man-cupsd.conf.html
@@ -598,14 +598,6 @@ responses.
 <dd></dd>
 <dd>Listens on the specified address and port for encrypted connections.
 </dd>
-<dt>SSLOptions None
-</dt>
-<dd></dd>
-<dt>SSLOptions NoEmptyFragments
-</dt>
-<dd></dd>
-<dd>Sets SSL/TLS protocol options for encrypted connections.
-</dd>
 <dt>SSLPort
 </dt>
 <dd></dd>