From 1e01995a1c5c7d406914c3aed6ceaa33f11bdf68 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Thu, 5 Sep 2019 12:33:42 -0400 Subject: [PATCH] Fix the default common name used by ippeveprinter... --- CHANGES.md | 3 ++- tools/ippeveprinter.c | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 4d3151b48..3d7271f67 100644 --- 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 76c57961a..62489430b 100644 --- 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... */ -- 2.39.2