From: Michael R Sweet Date: Fri, 11 May 2018 17:25:39 +0000 (-0700) Subject: Update changelog, copyright... X-Git-Tag: v2.3b5~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2de7c5f81cf94b6387969d9f694ea28af06c86e1;p=thirdparty%2Fcups.git Update changelog, copyright... --- diff --git a/CHANGES.md b/CHANGES.md index 33d80f70e2..7739a3fc4d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3rc1 - 2018-05-01 +CHANGES - 2.3rc1 - 2018-05-11 ============================= Changes in CUPS v2.3rc1 @@ -14,6 +14,7 @@ Changes in CUPS v2.3rc1 authentication schemes in a single response header (Issue #5289) - Fixed policy limits containing the `All` operation (Issue #5296) - The scheduler was always restarted after idle-exit with systemd (Issue #5297) +- The mailto notifier did not wait for the welcome message (Issue #5312) - Documentation updates (Issue #5299, Issue #5301, Issue #5306) - Fax queues did not support pause (p) or wait-for-dialtone (w) characters (rdar://39212256) diff --git a/notifier/mailto.c b/notifier/mailto.c index 9b3aeccaba..93258556a7 100644 --- a/notifier/mailto.c +++ b/notifier/mailto.c @@ -1,10 +1,11 @@ /* * "mailto" notifier for CUPS. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2005 by Easy Software Products. + * Copyright © 2007-2018 by Apple Inc. + * Copyright © 1997-2005 by Easy Software Products. * - * Licensed under Apache License v2.0. See the file "LICENSE" for more information. + * Licensed under Apache License v2.0. See the file "LICENSE" for more + * information. */ /* @@ -32,8 +33,7 @@ char mailtoSendmail[1024]; /* Sendmail program to use */ * Local functions... */ -void email_message(const char *to, const char *subject, - const char *text); +void email_message(const char *to, const char *subject, const char *text); int load_configuration(void); cups_file_t *pipe_sendmail(const char *to); void print_attributes(ipp_t *ipp, int indent); @@ -229,7 +229,9 @@ email_message(const char *to, /* I - Recipient of message */ if (strchr(mailtoSMTPServer, ':')) + { fp = cupsFileOpen(mailtoSMTPServer, "s"); + } else { char spec[1024]; /* Host:service spec */