opt/cups/str4531-1.patch

30 lines
1.0 KiB
Diff

commit 0c124a183ab2b56f85c98374ea0bdec1f5f89845
Author: msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>
Date: Tue Dec 9 17:58:18 2014 +0000
Additional fix for STR #4531.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12313 a1ca3aef-8c08-0410-bb20-df032aa958be
diff --git a/scheduler/conf.c b/scheduler/conf.c
index 9f22b40..352546e 100644
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -2934,6 +2934,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */
"FaxRetryLimit is deprecated; use "
"JobRetryLimit on line %d.", linenum);
}
+#ifdef HAVE_SSL
else if (!_cups_strcasecmp(line, "SSLOptions"))
{
/*
@@ -2977,6 +2978,7 @@ read_cupsd_conf(cups_file_t *fp) /* I - File to read from */
_httpTLSSetOptions(options);
}
+#endif /* HAVE_SSL */
else if ((!_cups_strcasecmp(line, "Port") || !_cups_strcasecmp(line, "Listen")
#ifdef HAVE_SSL
|| !_cups_strcasecmp(line, "SSLPort") || !_cups_strcasecmp(line, "SSLListen")