d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In the error-message routine for receiving a job, move the "cleanup" to be

Browse Source 
after the error message is printed, because the error message may refer to
variables the "cleanup" routine will zero out.

PR:		21007
This commit is contained in:
gad 2000-11-05 02:24:20 +00:00
parent bd8528d105
commit ddef9c422e
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
usr.sbin/lpr/lpd/recvjob.c
View File

@ -377,10 +377,25 @@ frecverr(msg, va_alist)
#else
va_start(ap);
#endif
rcleanup(0);
syslog(LOG_ERR, "%s", fromb);
syslog(LOG_ERR, "Error receiving job from %s:", fromb);
vsyslog(LOG_ERR, msg, ap);
va_end(ap);
/*
* rcleanup is not called until AFTER logging the error message,
* because rcleanup will zap some variables which may have been
* supplied as parameters for that msg...
*/
rcleanup(0);
/*
* Add a minimal delay before returning the final error code to
* the sending host. This just in case that machine responds
* this error by INSTANTLY retrying (and instantly re-failing...).
* It would be stupid of the sending host to do that, but if there
* was a broken implementation which did it, the result might be
* obscure performance problems and a flood of syslog messages on
* the receiving host.
*/
sleep(2); /* a paranoid throttling measure */
putchar('\1'); /* return error code */
exit(1);
}