spelling fixes; from paul tagliamonte
any parts of his diff not taken are noted on tech

Use <fcntl.h> instead of <sys/file.h> for open() and friends.
Delete a bunch of unnecessary #includes and sort to match style(9)
while doing the above cleanup.

ok deraadt@ krw@

Move ckqueue() to common_source/common.c

Patch from Chris Bennett, ok tb@

Remove NULL-check before free().

Remove support for lpd.pid file. OK deraadt@

Use AF_UNIX instead of AF_LOCAL.

Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
sizeof(struct sockaddr_un), so do the simple, portable thing.
Also convert some strncpy() to strlcpy()

ok deraadt@

Replace call to __ivaliduser_sa() with a pared down version that
only checks the host name. This clears the way for removal of
__ivaliduser_sa() and __ivaliduser() from libc. OK deraadt@

clean up flags++ instances around getopt()
ok florian

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Remove chunk special-casing malloc(siz) for realloc(NULL, siz). Bit
tricky, but note the remembered size is in bss.

Userland reallocarray() audit.

Avoid potential integer overflow in the size argument of malloc() and
realloc() by using reallocarray() to avoid unchecked multiplication.

ok deraadt@ (had same diff in tree)

The hosts.lpd file must exist, or no permission is granted. Change the
the log messages to clarify the reason for the failure to clarify the
condition.
ok guenther

Prevent lpd(8) from looking into hosts.equiv.
Access control is now done only using hosts.lpd.
See lpd(8) for more information about the format of this file.

"seems reasonable" tedu@
"looks good" deraadt@
ok sthen@

more ctype cleanups
checked by jca

handle ECONNABORTED errors from accept(). In many code blocks they can be
ignored silently and without aborting, much like EINTR and EWOULDBLOCK are.
ok's from various maintainers of these directories...

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable). these days, people use source. these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

cgetstr(3) can also return 2 so handle that. Also restructre things a bit
to get rid of the flag var. ok deraadt@ fgsch@

Comparing string literals does not work as the author expected.
From Adam Majer (debian maintaner); looks correct fgs@

use calloc() to avoid malloc(n * m) overflows; checked by djm canacar jsg

remove code for -W, argument now a no-op; ok millert@

remove #ifndef SUN_LEN; ok millert@

Remove those option letters from the getopt string which do not have a case
handler below. millert@ ok

typos from Jonathon Gray;

safer realloc. deraadt ok

realloc fixes; ok deraadt millert

plug mem leaks, pr3425 from patrick latifi. ok deraadt@

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.

use more socklen_t; pvalchev

uid_t and gid_t are unsigned

lprm needs to be setuid daemon after all

make this actually compile

Force lpd socket to be mode 0660, group daemon

Remove setuid root from lp*. lpr needs to be setuid daemon so the
files it creates are not owned by the user spooling them but the
others (lpc, lpq, lprm) can get away with setgid daemon. lpd runs
as user daemon for most things, only changing its uid to 0 for
things that must be done as root.

For the time being, don't require connections to come from a reserved
port since lpq/lpr/lprm can't acquire that w/o setuid root. In the
near future we will have a mechanism for select non-root processes
to grab reserved ports.

The upshot of this is that spool directories must be writable by
group daemon and the files within the spool dirs must be owned by
daemon.

Repair remote printing; maxfd was not set correctly for remote connections.

unlink lpd.pid if killed by a signal

Use O_EXLOCK in open() instead of flock() to eliminate a potential locking
race on the pid file.

Pull in useful bits from NetBSD and make our lp* easier to diff and
do some minor cleanup of my own:

o IPv6 support
o ANSI function headers
o use getopt()
o synce usage() with man pages
o passes -Wall on both 32bit and 64bit platforms
o add an option to set the max number of children lpd will fork off
o add an lpd option to bind to specific addresses instead of INADDR_ANY.
o allow user to specify how long to wait for a connection to remote servers
o more strlcpy() and snprintf() usage
o Use FOO_FILENO constants instead of hard-coding 0-2
o Add some keeps to man the page SYNOPSIS to avoid options being split

Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

s/deamon/daemon/

Revert local changes that should not have been committed

To disable a SIGCHLD signal handler use SIG_DFL, *not* SIG_IGN
which now has a different meaning.

use err/warn and friends instead of printf/exit.
also, remove fatal2() which is just errx anyway.

millert@ ok

use the same siginterrupt() trick in lpc(1) as in timedc(1). we have to hack
a global into the other programs since they share some source.

only slight fixes needed in signal handlers

do not select(20, ...)

Replace the deprecated BSD sigsetmask/sigblock/sigpause functions with their POSIX counterparts.

When using dup2() to make a socket be stdout, first check that it
is not already stdout (fd 1). Otherwise we end up closing stdout
which is not the intention. Also use STDOUT_FILENO instead of 1.
From a conversation with huntting@glarp.com.

o kill register
o add const to rcsid and copyright strings
o placate -Wall

use strlcpy vs strncpy+a[len-1]='\0'

Set SO_REUSEADDR on printer/tcp service (port 515); csapuntz@clearviewtech.com

save errno in sigchld handlers

Wall cleanup; people running lpd should test!

Add OpenBSD tags (was in wrong dir for previous commit)

initialize name; is this the right hack?

Improve portability by using ANSI/POSIX interfaces when possible.

we are so ftp bounce paranoid, we checked twice!

doh

i so rarely forget htons & friends; this time i did -- warner caught me

oflow protection, ftp bounce protection, dns spoof protection

ftp bounce protection

Fix bogon in import

Integrated 4.4Lite2 source
Fixed potential problem pointed out by bitblt

headers

save some bytes of disk

branches: 1.1.1;
Initial revision

Use <fcntl.h> instead of <sys/file.h> for open() and friends.
Delete a bunch of unnecessary #includes and sort to match style(9)
while doing the above cleanup.

ok deraadt@ krw@

Move ckqueue() to common_source/common.c

Patch from Chris Bennett, ok tb@

Remove NULL-check before free().

Remove support for lpd.pid file. OK deraadt@

Use AF_UNIX instead of AF_LOCAL.

Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
sizeof(struct sockaddr_un), so do the simple, portable thing.
Also convert some strncpy() to strlcpy()

ok deraadt@

Replace call to __ivaliduser_sa() with a pared down version that
only checks the host name. This clears the way for removal of
__ivaliduser_sa() and __ivaliduser() from libc. OK deraadt@

clean up flags++ instances around getopt()
ok florian

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Remove chunk special-casing malloc(siz) for realloc(NULL, siz). Bit
tricky, but note the remembered size is in bss.

Userland reallocarray() audit.

Avoid potential integer overflow in the size argument of malloc() and
realloc() by using reallocarray() to avoid unchecked multiplication.

ok deraadt@ (had same diff in tree)

The hosts.lpd file must exist, or no permission is granted. Change the
the log messages to clarify the reason for the failure to clarify the
condition.
ok guenther

Prevent lpd(8) from looking into hosts.equiv.
Access control is now done only using hosts.lpd.
See lpd(8) for more information about the format of this file.

"seems reasonable" tedu@
"looks good" deraadt@
ok sthen@

more ctype cleanups
checked by jca

handle ECONNABORTED errors from accept(). In many code blocks they can be
ignored silently and without aborting, much like EINTR and EWOULDBLOCK are.
ok's from various maintainers of these directories...

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable). these days, people use source. these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

cgetstr(3) can also return 2 so handle that. Also restructre things a bit
to get rid of the flag var. ok deraadt@ fgsch@

Comparing string literals does not work as the author expected.
From Adam Majer (debian maintaner); looks correct fgs@

use calloc() to avoid malloc(n * m) overflows; checked by djm canacar jsg

remove code for -W, argument now a no-op; ok millert@

remove #ifndef SUN_LEN; ok millert@

Remove those option letters from the getopt string which do not have a case
handler below. millert@ ok

typos from Jonathon Gray;

safer realloc. deraadt ok

realloc fixes; ok deraadt millert

plug mem leaks, pr3425 from patrick latifi. ok deraadt@

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.

use more socklen_t; pvalchev

uid_t and gid_t are unsigned

lprm needs to be setuid daemon after all

make this actually compile

Force lpd socket to be mode 0660, group daemon

Remove setuid root from lp*. lpr needs to be setuid daemon so the
files it creates are not owned by the user spooling them but the
others (lpc, lpq, lprm) can get away with setgid daemon. lpd runs
as user daemon for most things, only changing its uid to 0 for
things that must be done as root.

For the time being, don't require connections to come from a reserved
port since lpq/lpr/lprm can't acquire that w/o setuid root. In the
near future we will have a mechanism for select non-root processes
to grab reserved ports.

The upshot of this is that spool directories must be writable by
group daemon and the files within the spool dirs must be owned by
daemon.

Repair remote printing; maxfd was not set correctly for remote connections.

unlink lpd.pid if killed by a signal

Use O_EXLOCK in open() instead of flock() to eliminate a potential locking
race on the pid file.

Pull in useful bits from NetBSD and make our lp* easier to diff and
do some minor cleanup of my own:

o IPv6 support
o ANSI function headers
o use getopt()
o synce usage() with man pages
o passes -Wall on both 32bit and 64bit platforms
o add an option to set the max number of children lpd will fork off
o add an lpd option to bind to specific addresses instead of INADDR_ANY.
o allow user to specify how long to wait for a connection to remote servers
o more strlcpy() and snprintf() usage
o Use FOO_FILENO constants instead of hard-coding 0-2
o Add some keeps to man the page SYNOPSIS to avoid options being split

Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

s/deamon/daemon/

Revert local changes that should not have been committed

To disable a SIGCHLD signal handler use SIG_DFL, *not* SIG_IGN
which now has a different meaning.

use err/warn and friends instead of printf/exit.
also, remove fatal2() which is just errx anyway.

millert@ ok

use the same siginterrupt() trick in lpc(1) as in timedc(1). we have to hack
a global into the other programs since they share some source.

only slight fixes needed in signal handlers

do not select(20, ...)

Replace the deprecated BSD sigsetmask/sigblock/sigpause functions with their POSIX counterparts.

When using dup2() to make a socket be stdout, first check that it
is not already stdout (fd 1). Otherwise we end up closing stdout
which is not the intention. Also use STDOUT_FILENO instead of 1.
From a conversation with huntting@glarp.com.

o kill register
o add const to rcsid and copyright strings
o placate -Wall

use strlcpy vs strncpy+a[len-1]='\0'

Set SO_REUSEADDR on printer/tcp service (port 515); csapuntz@clearviewtech.com

save errno in sigchld handlers

Wall cleanup; people running lpd should test!

Add OpenBSD tags (was in wrong dir for previous commit)

initialize name; is this the right hack?

Improve portability by using ANSI/POSIX interfaces when possible.

we are so ftp bounce paranoid, we checked twice!

doh

i so rarely forget htons & friends; this time i did -- warner caught me

oflow protection, ftp bounce protection, dns spoof protection

ftp bounce protection

Fix bogon in import

Integrated 4.4Lite2 source
Fixed potential problem pointed out by bitblt

headers

save some bytes of disk

branches: 1.1.1;
Initial revision

Move ckqueue() to common_source/common.c

Patch from Chris Bennett, ok tb@

Remove NULL-check before free().

Remove support for lpd.pid file. OK deraadt@

Use AF_UNIX instead of AF_LOCAL.

Userspace doesn't need to use SUN_LEN(): connect() and bind() must accept
sizeof(struct sockaddr_un), so do the simple, portable thing.
Also convert some strncpy() to strlcpy()

ok deraadt@

Replace call to __ivaliduser_sa() with a pared down version that
only checks the host name. This clears the way for removal of
__ivaliduser_sa() and __ivaliduser() from libc. OK deraadt@

clean up flags++ instances around getopt()
ok florian

Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)

Remove chunk special-casing malloc(siz) for realloc(NULL, siz). Bit
tricky, but note the remembered size is in bss.

Userland reallocarray() audit.

Avoid potential integer overflow in the size argument of malloc() and
realloc() by using reallocarray() to avoid unchecked multiplication.

ok deraadt@ (had same diff in tree)

The hosts.lpd file must exist, or no permission is granted. Change the
the log messages to clarify the reason for the failure to clarify the
condition.
ok guenther

Prevent lpd(8) from looking into hosts.equiv.
Access control is now done only using hosts.lpd.
See lpd(8) for more information about the format of this file.

"seems reasonable" tedu@
"looks good" deraadt@
ok sthen@

more ctype cleanups
checked by jca

handle ECONNABORTED errors from accept(). In many code blocks they can be
ignored silently and without aborting, much like EINTR and EWOULDBLOCK are.
ok's from various maintainers of these directories...

rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and
unmaintainable). these days, people use source. these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

cgetstr(3) can also return 2 so handle that. Also restructre things a bit
to get rid of the flag var. ok deraadt@ fgsch@

Comparing string literals does not work as the author expected.
From Adam Majer (debian maintaner); looks correct fgs@

use calloc() to avoid malloc(n * m) overflows; checked by djm canacar jsg

remove code for -W, argument now a no-op; ok millert@

remove #ifndef SUN_LEN; ok millert@

Remove those option letters from the getopt string which do not have a case
handler below. millert@ ok

typos from Jonathon Gray;

safer realloc. deraadt ok

realloc fixes; ok deraadt millert

plug mem leaks, pr3425 from patrick latifi. ok deraadt@

Remove the advertising clause in the UCB license which Berkeley
rescinded 22 July 1999. Proofed by myself and Theo.

use more socklen_t; pvalchev

uid_t and gid_t are unsigned

lprm needs to be setuid daemon after all

make this actually compile

Force lpd socket to be mode 0660, group daemon

Remove setuid root from lp*. lpr needs to be setuid daemon so the
files it creates are not owned by the user spooling them but the
others (lpc, lpq, lprm) can get away with setgid daemon. lpd runs
as user daemon for most things, only changing its uid to 0 for
things that must be done as root.

For the time being, don't require connections to come from a reserved
port since lpq/lpr/lprm can't acquire that w/o setuid root. In the
near future we will have a mechanism for select non-root processes
to grab reserved ports.

The upshot of this is that spool directories must be writable by
group daemon and the files within the spool dirs must be owned by
daemon.

Repair remote printing; maxfd was not set correctly for remote connections.

unlink lpd.pid if killed by a signal

Use O_EXLOCK in open() instead of flock() to eliminate a potential locking
race on the pid file.

Pull in useful bits from NetBSD and make our lp* easier to diff and
do some minor cleanup of my own:

o IPv6 support
o ANSI function headers
o use getopt()
o synce usage() with man pages
o passes -Wall on both 32bit and 64bit platforms
o add an option to set the max number of children lpd will fork off
o add an lpd option to bind to specific addresses instead of INADDR_ANY.
o allow user to specify how long to wait for a connection to remote servers
o more strlcpy() and snprintf() usage
o Use FOO_FILENO constants instead of hard-coding 0-2
o Add some keeps to man the page SYNOPSIS to avoid options being split

Part one of userland __P removal. Done with a simple regexp with some minor hand editing to make comments line up correctly. Another pass is forthcoming that handles the cases that could not be done automatically.

s/deamon/daemon/

Revert local changes that should not have been committed

To disable a SIGCHLD signal handler use SIG_DFL, *not* SIG_IGN
which now has a different meaning.

use err/warn and friends instead of printf/exit.
also, remove fatal2() which is just errx anyway.

millert@ ok

use the same siginterrupt() trick in lpc(1) as in timedc(1). we have to hack
a global into the other programs since they share some source.

only slight fixes needed in signal handlers

do not select(20, ...)

Replace the deprecated BSD sigsetmask/sigblock/sigpause functions with their POSIX counterparts.

When using dup2() to make a socket be stdout, first check that it
is not already stdout (fd 1). Otherwise we end up closing stdout
which is not the intention. Also use STDOUT_FILENO instead of 1.
From a conversation with huntting@glarp.com.

o kill register
o add const to rcsid and copyright strings
o placate -Wall

use strlcpy vs strncpy+a[len-1]='\0'

Set SO_REUSEADDR on printer/tcp service (port 515); csapuntz@clearviewtech.com

save errno in sigchld handlers

Wall cleanup; people running lpd should test!

Add OpenBSD tags (was in wrong dir for previous commit)

initialize name; is this the right hack?

Improve portability by using ANSI/POSIX interfaces when possible.

we are so ftp bounce paranoid, we checked twice!

doh

i so rarely forget htons & friends; this time i did -- warner caught me

oflow protection, ftp bounce protection, dns spoof protection

ftp bounce protection

Fix bogon in import

Integrated 4.4Lite2 source
Fixed potential problem pointed out by bitblt

headers

save some bytes of disk

branches: 1.1.1;
Initial revision