diff options
| author |   jakob <jakob@openbsd.org> | 2004-09-28 17:14:01 +0000 |
|---|---|---|
| committer | jakob <jakob@openbsd.org> | 2004-09-28 17:14:01 +0000 |
| commit | b2d2683558b03d82a0e27c5ba2cc4a8587a76bb9 (patch) | |
| tree | 46d872038a60738a8adb1c055a5cff3127d790b1 /usr.sbin/bind/lib/isc/unix/privsep_fdpass.c | |
| parent | Use ETHER_MIN_LEN/ETHER_MAX_DIX_LEN (diff) | |
| download | wireguard-openbsd-b2d2683558b03d82a0e27c5ba2cc4a8587a76bb9.tar.xz wireguard-openbsd-b2d2683558b03d82a0e27c5ba2cc4a8587a76bb9.zip | |
resolve conflicts
Diffstat (limited to 'usr.sbin/bind/lib/isc/unix/privsep_fdpass.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/unix/privsep_fdpass.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/bind/lib/isc/unix/privsep_fdpass.c b/usr.sbin/bind/lib/isc/unix/privsep_fdpass.c index f52bee57179..65f18fc8775 100644 --- a/usr.sbin/bind/lib/isc/unix/privsep_fdpass.c +++ b/usr.sbin/bind/lib/isc/unix/privsep_fdpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: privsep_fdpass.c,v 1.3 2004/08/13 02:51:48 djm Exp $ */ +/* $OpenBSD: privsep_fdpass.c,v 1.4 2004/09/28 17:14:07 jakob Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> @@ -105,10 +105,6 @@ receive_fd(int sock) __func__, (long)n); if (result == 0) { cmsg = CMSG_FIRSTHDR(&msg); - if (cmsg == NULL) { - warnx("%s: no message header", __func__); - return (-1); - } if (cmsg->cmsg_type != SCM_RIGHTS) warnx("%s: expected type %d got %d", __func__, SCM_RIGHTS, cmsg->cmsg_type); |