Fix the `ServerTokens None` option (Issue #5065)

diff --git a/CHANGES.md b/CHANGES.md
index 5ff87a7312d21db20d96f53f30305238555ebcc4..4092efdc9312e61c818192f9f81df1a2c54a6cd8 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -18,6 +18,8 @@ CHANGES IN CUPS V2.2.5
   all registered IPP attributes and values (Issue #5056)
 - The --enable-libtool configure option requires a path to the libtool program,
   but doesn't document or check for it (Issue #5062)
+- Fixed the `SSLOptions DenyCBC` option when using GNU TLS (Issue #5065)
+- Fixed the `ServerTokens None` option (Issue #5065)
 - Fixed an issue with Chinese localizations on macOS (rdar://32419311)
 - The IPP backend now always sends the "finishings" attribute for printers that
   support it because otherwise the client cannot override printer defaults
@@ -28,7 +30,6 @@ CHANGES IN CUPS V2.2.5
   printers (rdar://33250434)
 - Fixed the `cups.strings` file that is used on macOS (rdar://33287650)
 - CUPS now sends the `Date` HTTP header in IPP requests (rdar://33302034)
-- Fixed the DenyCBC option when using GNU TLS.
 
 
 CHANGES IN CUPS V2.2.4

diff --git a/scheduler/conf.c b/scheduler/conf.c
index dcac7b60df99b9a26afd8ca04c096ea9160d18f7..02d415c0de8205c607822ff40796a27fc6d5a67d 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -3330,7 +3330,7 @@ read_cupsd_conf(cups_file_t *fp)  /* I - File to read from */
        cupsdSetStringf(&ServerHeader, CUPS_MINIMAL " (%s %s; %s) IPP/2.1",
                        plat.sysname, plat.release, plat.machine);
       else if (!_cups_strcasecmp(value, "None"))
-       cupsdClearString(&ServerHeader);
+       cupsdSetString(&ServerHeader, "");
       else
        cupsdLogMessage(CUPSD_LOG_WARN, "Unknown ServerTokens %s on line %d of %s.",
                         value, linenum, ConfigurationFile);