Date: Thu, 12 Jan 2017 16:33:13 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431282 - in head/print/cups: . files Message-ID: <201701121633.v0CGXDUd053634@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Jan 12 16:33:12 2017 New Revision: 431282 URL: https://svnweb.freebsd.org/changeset/ports/431282 Log: The return value of cupsdStartProcess is zero on error. Fix two cases where this is checked incorrectly. PR: 211465 Added: head/print/cups/files/patch-scheduler_client.c (contents, props changed) head/print/cups/files/patch-scheduler_subscriptions.c (contents, props changed) Modified: head/print/cups/Makefile Modified: head/print/cups/Makefile ============================================================================== --- head/print/cups/Makefile Thu Jan 12 15:53:07 2017 (r431281) +++ head/print/cups/Makefile Thu Jan 12 16:33:12 2017 (r431282) @@ -4,6 +4,7 @@ PORTNAME= cups PORTVERSION= 2.2.1 DISTVERSIONPREFIX=v +PORTREVISION= 1 CATEGORIES= print MAINTAINER= tijl@FreeBSD.org Added: head/print/cups/files/patch-scheduler_client.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups/files/patch-scheduler_client.c Thu Jan 12 16:33:12 2017 (r431282) @@ -0,0 +1,13 @@ +--- scheduler/client.c.orig 2016-10-03 19:55:40 UTC ++++ scheduler/client.c +@@ -3818,8 +3818,8 @@ pipe_command(cupsd_client_t *con, /* I - + * Then execute the command... + */ + +- if (cupsdStartProcess(command, argv, envp, infile, fds[1], CGIPipes[1], +- -1, -1, root, DefaultProfile, NULL, &pid) < 0) ++ if (!cupsdStartProcess(command, argv, envp, infile, fds[1], CGIPipes[1], ++ -1, -1, root, DefaultProfile, NULL, &pid)) + { + /* + * Error - can't fork! Added: head/print/cups/files/patch-scheduler_subscriptions.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups/files/patch-scheduler_subscriptions.c Thu Jan 12 16:33:12 2017 (r431282) @@ -0,0 +1,13 @@ +--- scheduler/subscriptions.c.orig 2016-10-03 19:55:40 UTC ++++ scheduler/subscriptions.c +@@ -1561,8 +1561,8 @@ cupsd_start_notifier( + * Create the notifier process... + */ + +- if (cupsdStartProcess(command, argv, envp, fds[0], -1, NotifierPipes[1], +- -1, -1, 0, DefaultProfile, NULL, &pid) < 0) ++ if (!cupsdStartProcess(command, argv, envp, fds[0], -1, NotifierPipes[1], ++ -1, -1, 0, DefaultProfile, NULL, &pid)) + { + /* + * Error - can't fork!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701121633.v0CGXDUd053634>