From 3d1f41307e66ceb5ab9e8f903aeda66359615483 Mon Sep 17 00:00:00 2001 From: msweet Date: Fri, 18 Jul 2014 20:37:49 +0000 Subject: [PATCH] Mirror fix from trunk. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.7@12052 a1ca3aef-8c08-0410-bb20-df032aa958be --- CHANGES.txt | 3 ++- scheduler/client.c | 7 +------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 9fd62a0731..fc659438f2 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,9 +1,10 @@ -CHANGES.txt - 1.7.4 - 2014-07-15 +CHANGES.txt - 1.7.4 - 2014-07-18 -------------------------------- CHANGES IN CUPS V1.7.5 - The LPD backend did not work with some versions of glibc (STR #4452) + - CGI scripts did not work (STR #4454) CHANGES IN CUPS V1.7.4 diff --git a/scheduler/client.c b/scheduler/client.c index deb0231616..e5959faf78 100644 --- a/scheduler/client.c +++ b/scheduler/client.c @@ -3812,12 +3812,7 @@ pipe_command(cupsd_client_t *con, /* I - Client connection */ argv[0] = command; if (options) - { - commptr = options; - if (*commptr == ' ') - commptr ++; - strlcpy(argbuf, commptr, sizeof(argbuf)); - } + strlcpy(argbuf, options, sizeof(argbuf)); else argbuf[0] = '\0'; -- 2.47.2