[src/netbsd-1-4]: src/usr.sbin/lpr/lpd Pull up revisions 1.23-1.24 (requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5e4d33f17805
branches:  netbsd-1-4
changeset: 470927:5e4d33f17805
user:      he <he%NetBSD.org@localhost>
date:      Wed Oct 04 13:58:15 2000 +0000

description:
Pull up revisions 1.23-1.24 (requested by sommerfeld):
  Fix potential syslog() format string hole.

diffstat:

 usr.sbin/lpr/lpd/printjob.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r 9f9eb1323d4a -r 5e4d33f17805 usr.sbin/lpr/lpd/printjob.c
--- a/usr.sbin/lpr/lpd/printjob.c       Tue Sep 26 15:25:01 2000 +0000
+++ b/usr.sbin/lpr/lpd/printjob.c       Wed Oct 04 13:58:15 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: printjob.c,v 1.19 1998/07/06 07:03:28 mrg Exp $        */
+/*     $NetBSD: printjob.c,v 1.19.2.1 2000/10/04 13:58:15 he Exp $     */
 
 /*
  * Copyright (c) 1983, 1993
@@ -45,7 +45,7 @@
 #if 0
 static char sccsid[] = "@(#)printjob.c 8.7 (Berkeley) 5/10/95";
 #else
-__RCSID("$NetBSD: printjob.c,v 1.19 1998/07/06 07:03:28 mrg Exp $");
+__RCSID("$NetBSD: printjob.c,v 1.19.2.1 2000/10/04 13:58:15 he Exp $");
 #endif
 #endif /* not lint */
 
@@ -1097,6 +1097,7 @@
                        cp = "NOACCT";
                        break;
                case FILTERERR:
+                       cp = "FILTERERR";
                        if (stat(tempfile, &stb) < 0 || stb.st_size == 0 ||
                            (fp = fopen(tempfile, "r")) == NULL) {
                                printf("\nhad some errors and may not have printed\n");
@@ -1106,7 +1107,6 @@
                        while ((i = getc(fp)) != EOF)
                                putchar(i);
                        (void)fclose(fp);
-                       cp = "FILTERERR";
                        break;
                case ACCESS:
                        printf("\nwas not printed because it was not linked to the original file\n");
@@ -1233,7 +1233,7 @@
        (void)snprintf(&pxlength[2], sizeof(pxlength) - 2, "%ld", PY);
        cgetstr(bp, "rm", &RM);
        if ((s = checkremote()) != NULL)
-               syslog(LOG_WARNING, s);
+               syslog(LOG_WARNING, "%s", s);
 
        cgetstr(bp, "af", &AF);
        cgetstr(bp, "of", &OF);