Fix the default ServerAlias value (Issue #5072)

diff --git a/CHANGES.md b/CHANGES.md
index 2f9812ff4ba162aff3c4b9d3a19fe3ed52384bbc..7dcba56a1729b4442c51bc98bf5c7c5c42043ab6 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.5 - 2017-07-23
+CHANGES - 2.2.5 - 2017-07-31
 ============================
 
 CHANGES IN CUPS V2.2.5
@@ -21,6 +21,7 @@ CHANGES IN CUPS V2.2.5
   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 the default `ServerAlias` value from `ServerName` (Issue #5072)
 - 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

diff --git a/scheduler/conf.c b/scheduler/conf.c
index 02d415c0de8205c607822ff40796a27fc6d5a67d..bc52d2add18543bb02ac61ae2b6a969021fe4f75 100644 (file)
--- a/scheduler/conf.c
+++ b/scheduler/conf.c
@@ -878,6 +878,7 @@ cupsdReadConfiguration(void)
     if (!ServerAlias)
       ServerAlias = cupsArrayNew(NULL, NULL);
 
+    cupsdAddAlias(ServerAlias, ServerName);
     cupsdLogMessage(CUPSD_LOG_DEBUG, "Added auto ServerAlias %s", ServerName);
   }
   else