diff options
Diffstat (limited to 'usr.sbin/lpr/common_source')
| -rw-r--r-- | usr.sbin/lpr/common_source/common.c | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/common_vars.c | 7 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/displayq.c | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/rmjob.c | 5 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/startdaemon.c | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/usr.sbin/lpr/common_source/common.c b/usr.sbin/lpr/common_source/common.c index fd48614df1c..e2d4a063545 100644 --- a/usr.sbin/lpr/common_source/common.c +++ b/usr.sbin/lpr/common_source/common.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common.c,v 1.37 2014/11/02 13:56:55 deraadt Exp $ */ +/* $OpenBSD: common.c,v 1.38 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: common.c,v 1.21 2000/08/09 14:28:50 itojun Exp $ */ /* @@ -35,7 +35,6 @@ * SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/stat.h> #include <sys/time.h> @@ -48,6 +47,7 @@ #include <errno.h> #include <fcntl.h> #include <unistd.h> +#include <limits.h> #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/usr.sbin/lpr/common_source/common_vars.c b/usr.sbin/lpr/common_source/common_vars.c index a7cdb5fb494..372e7bae96b 100644 --- a/usr.sbin/lpr/common_source/common_vars.c +++ b/usr.sbin/lpr/common_source/common_vars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: common_vars.c,v 1.4 2009/10/27 23:59:51 deraadt Exp $ */ +/* $OpenBSD: common_vars.c,v 1.5 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: common.c,v 1.15 1999/09/26 10:32:27 mrg Exp $ */ /* @@ -35,13 +35,14 @@ * SUCH DAMAGE. */ -#include <sys/param.h> +#include <sys/types.h> +#include <limits.h> #include "pathnames.h" char *name; /* program name */ char *printer; /* printer name */ -char host[MAXHOSTNAMELEN+1]; /* host machine name */ +char host[HOST_NAME_MAX+1 + 1]; /* host machine name */ char *from = host; /* client's machine name */ char *printcapdb[2] = { _PATH_PRINTCAP, 0 }; char *bp; /* pointer into printcap buffer. */ diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c index 5f3301e785b..0d401b7a7b5 100644 --- a/usr.sbin/lpr/common_source/displayq.c +++ b/usr.sbin/lpr/common_source/displayq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: displayq.c,v 1.35 2014/05/21 18:38:42 pascal Exp $ */ +/* $OpenBSD: displayq.c,v 1.36 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: displayq.c,v 1.21 2001/08/30 00:51:50 itojun Exp $ */ /* @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/file.h> #include <sys/ioctl.h> #include <sys/stat.h> @@ -39,6 +38,7 @@ #include <errno.h> #include <dirent.h> #include <fcntl.h> +#include <limits.h> #include <signal.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 1c3307daba0..d1c997fd2e9 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.h,v 1.18 2013/12/10 16:38:04 naddy Exp $ */ +/* $OpenBSD: lp.h,v 1.19 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: lp.h,v 1.14 2000/04/16 14:43:58 mrg Exp $ */ /* @@ -78,7 +78,7 @@ extern char line[BUFSIZ]; extern char *bp; /* pointer into printcap buffer */ extern char *printer; /* printer name */ /* host machine name */ -extern char host[MAXHOSTNAMELEN]; +extern char host[HOST_NAME_MAX+1]; extern char *from; /* client's machine name */ extern int remote; /* true if sending files to a remote host */ extern char *printcapdb[]; /* printcap database array */ diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index f481a7aabf0..e58822aa349 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmjob.c,v 1.21 2013/11/24 21:32:32 deraadt Exp $ */ +/* $OpenBSD: rmjob.c,v 1.22 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: rmjob.c,v 1.16 2000/04/16 14:43:58 mrg Exp $ */ /* @@ -30,13 +30,12 @@ * SUCH DAMAGE. */ -#include <sys/param.h> - #include <signal.h> #include <errno.h> #include <fcntl.h> #include <dirent.h> #include <unistd.h> +#include <limits.h> #include <stdlib.h> #include <stdio.h> #include <string.h> diff --git a/usr.sbin/lpr/common_source/startdaemon.c b/usr.sbin/lpr/common_source/startdaemon.c index 6274215387f..84988f3e3ed 100644 --- a/usr.sbin/lpr/common_source/startdaemon.c +++ b/usr.sbin/lpr/common_source/startdaemon.c @@ -1,4 +1,4 @@ -/* $OpenBSD: startdaemon.c,v 1.14 2014/07/20 01:38:40 guenther Exp $ */ +/* $OpenBSD: startdaemon.c,v 1.15 2015/01/16 06:40:17 deraadt Exp $ */ /* $NetBSD: startdaemon.c,v 1.10 1998/07/18 05:04:39 lukem Exp $ */ /* @@ -30,7 +30,6 @@ * SUCH DAMAGE. */ -#include <sys/param.h> #include <sys/socket.h> #include <sys/un.h> @@ -39,6 +38,7 @@ #include <errno.h> #include <stdio.h> #include <unistd.h> +#include <limits.h> #include <string.h> #include <signal.h> |