diff options
| author | basabi <none@none> | 2006-01-24 07:11:42 -0800 |
|---|---|---|
| committer | basabi <none@none> | 2006-01-24 07:11:42 -0800 |
| commit | 55aa09b1d2d1c95b727750505cee02091e6776de (patch) | |
| tree | 12bfe4711db48b919b3411ca9b284b45b3d5ee97 /usr/src/cmd/cron | |
| parent | 8f71b825a058931366b1fbde8e26c1e5c2f8372d (diff) | |
| download | illumos-joyent-55aa09b1d2d1c95b727750505cee02091e6776de.tar.gz | |
6270017 cron/at-jobs log warning about not obtaining latest contract from popen(3c)
Diffstat (limited to 'usr/src/cmd/cron')
| -rw-r--r-- | usr/src/cmd/cron/cron.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/usr/src/cmd/cron/cron.c b/usr/src/cmd/cron/cron.c index a127f3800c..9b7e031b53 100644 --- a/usr/src/cmd/cron/cron.c +++ b/usr/src/cmd/cron/cron.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2005 Sun Microsystems, Inc. All rights reserved. + * Copyright 2006 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2437,7 +2437,6 @@ mail_result(struct usr *p, struct runinfo *pr, size_t filesize) cmd = xmalloc(strlen(MAIL)+strlen(p->name)+2); (void) sprintf(cmd, "%s %s", MAIL, p->name); mailpipe = popen(cmd, "w"); - contract_abandon_latest(0); free(cmd); if (mailpipe == NULL) exit(127); @@ -3307,12 +3306,8 @@ contract_abandon_latest(pid_t pid) REMOVE_FIFO | CONSOLE_MSG); if (r = contract_latest(&id)) { - if (pid == 0) - msg("could not obtain latest contract from " - "popen(3C): %s", strerror(r)); - else - msg("could not obtain latest contract for " - "PID %ld: %s", pid, strerror(r)); + msg("could not obtain latest contract for " + "PID %ld: %s", pid, strerror(r)); cts_lost++; return; } |