diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-09-05 12:35:53 -0400 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-09-05 12:35:53 -0400 |
| commit | 81d39a9fd3717613a9b1a5aef1600c5a51a6149c (patch) | |
| tree | 25d57663b96ebad2faad4ff1fb066146601c6bfb | |
| parent | 250c2783c00926aaccbef93d14138b672bca4a53 (diff) | |
| download | cups-81d39a9fd3717613a9b1a5aef1600c5a51a6149c.tar.gz | |
Mirror TLS certificate fix from master for ippserver.
| -rw-r--r-- | CHANGES.md | 3 | ||||
| -rw-r--r-- | test/ippserver.c | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/CHANGES.md b/CHANGES.md index 718cf993c..e6d4c2a5d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.2.13 - 2019-08-27 +CHANGES - 2.2.13 - 2019-09-05 ============================= @@ -6,6 +6,7 @@ Changes in CUPS v2.2.13 ----------------------- - Fixed spelling of "fold-accordion". +- Fixed the default common name for TLS certificates used by `ippserver`. Changes in CUPS v2.2.12 diff --git a/test/ippserver.c b/test/ippserver.c index 237727eba..7d83158a2 100644 --- a/test/ippserver.c +++ b/test/ippserver.c @@ -1,7 +1,7 @@ /* * Sample IPP Everywhere server for CUPS. * - * Copyright 2010-2018 by Apple Inc. + * Copyright 2010-2019 by Apple Inc. * * These coded instructions, statements, and computer programs are the * property of Apple Inc. and are protected by Federal copyright @@ -696,10 +696,6 @@ main(int argc, /* I - Number of command-line args */ fprintf(stderr, "Using spool directory \"%s\".\n", directory); } -#ifdef HAVE_SSL - cupsSetServerCredentials(keypath, servername, 1); -#endif /* HAVE_SSL */ - /* * Initialize Bonjour... */ @@ -715,6 +711,10 @@ main(int argc, /* I - Number of command-line args */ subtype, directory, command, attrfile)) == NULL) return (1); +#ifdef HAVE_SSL + cupsSetServerCredentials(keypath, printer->hostname, 1); +#endif /* HAVE_SSL */ + /* * Run the print service... */ |