From: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue, 9 Dec 2014 17:51:55 +0000 (+0000)
Subject: Fixed builds when no SSL/TLS library is available, or when explicitly disabled
X-Git-Tag: v2.2b1~422
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22ebb7d0baab7243c52adbffb8067e4f7e2b233d;p=thirdparty%2Fcups.git

Fixed builds when no SSL/TLS library is available, or when explicitly disabled
(STR #4531)



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

diff --git a/CHANGES-2.0.txt b/CHANGES-2.0.txt
index bd44c4e771..6b02d792bf 100644
--- a/CHANGES-2.0.txt
+++ b/CHANGES-2.0.txt
@@ -15,6 +15,8 @@ CHANGES IN CUPS V2.0.2
 	  (<rdar://problem/19129387>)
 	- The cups-files.conf file contained the old ServerCertificate/Key
 	  directives instead of ServerKeychain.
+	- Fixed builds when no SSL/TLS library is available, or when explicitly
+	  disabled (STR #4531)
 
 
 CHANGES IN CUPS V2.0.1
diff --git a/cups/usersys.c b/cups/usersys.c
index ab5849f40e..da603e294e 100644
--- a/cups/usersys.c
+++ b/cups/usersys.c
@@ -955,6 +955,8 @@ cups_read_client_conf(
 #endif /* HAVE_GSSAPI */
 
 
+  (void)ssl_options; /* Silence compiler warning */
+
  /*
   * Read from the file...
   */
@@ -1009,6 +1011,7 @@ cups_read_client_conf(
       cups_gssservicename = gss_service_name;
     }
 #endif /* HAVE_GSSAPI */
+#ifdef HAVE_SSL
     else if (ssl_options && !_cups_strcasecmp(line, "SSLOptions") && value)
     {
      /*
@@ -1046,6 +1049,7 @@ cups_read_client_conf(
 
       _httpTLSSetOptions(options);
     }
+#endif /* HAVE_SSL */
   }
 
  /*