Fix the default common name used by ippeveprinter...

diff --git a/CHANGES.md b/CHANGES.md
index 4d3151b488bfd2766c19cdb77b191033e0381530..3d7271f67d94762c27ba6ef5bdbc116ef2fb4b2a 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.3.1 - 2019-08-27
+CHANGES - 2.3.1 - 2019-09-05
 ============================
 
 
@@ -6,6 +6,7 @@ Changes in CUPS v2.3.1
 ----------------------
 
 - Fixed spelling of "fold-accordion".
+- Fixed the default common name for TLS certificates used by `ippeveprinter`.
 
 
 Changes in CUPS v2.3.0

diff --git a/tools/ippeveprinter.c b/tools/ippeveprinter.c
index 76c57961a5262826cabd3c589c597e739a678dc5..62489430b1a1e69cb3baf883697ffd9bfeb6dc91 100644 (file)
--- a/tools/ippeveprinter.c
+++ b/tools/ippeveprinter.c
@@ -631,10 +631,6 @@ main(int  argc,                            /* I - Number of command-line args */
       _cupsLangPrintf(stderr, _("Using spool directory \"%s\"."), directory);
   }
 
-#ifdef HAVE_SSL
-  cupsSetServerCredentials(keypath, servername, 1);
-#endif /* HAVE_SSL */
-
  /*
   * Initialize DNS-SD...
   */
@@ -675,6 +671,10 @@ main(int  argc,                            /* I - Number of command-line args */
     printer->ppdfile = strdup(ppdfile);
 #endif /* !CUPS_LITE */
 
+#ifdef HAVE_SSL
+  cupsSetServerCredentials(keypath, printer->hostname, 1);
+#endif /* HAVE_SSL */
+
  /*
   * Run the print service...
   */