diff options
| author |   deraadt <deraadt@openbsd.org> | 2012-04-13 12:24:51 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2012-04-13 12:24:51 +0000 |
| commit | 9eb8efc2c1aa0bad1a3dfb9b1688a7f5c541ad3d (patch) | |
| tree | 9247706f639fbc5c1b34bd39587e7bad65c1aa67 | |
| parent | Fix waiting problem at boot on AMD Hudson's AHCI. (diff) | |
| download | wireguard-openbsd-9eb8efc2c1aa0bad1a3dfb9b1688a7f5c541ad3d.tar.xz wireguard-openbsd-9eb8efc2c1aa0bad1a3dfb9b1688a7f5c541ad3d.zip | |
Don't assume that the new conffd is a unset in the fd_set, it could be a
recyle of a fd which is still set.
ok claudio
| -rw-r--r-- | libexec/spamd/spamd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index b860f6d59ef..29245a05d0e 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.108 2010/01/14 00:44:12 beck Exp $ */ +/* $OpenBSD: spamd.c,v 1.109 2012/04/13 12:24:51 deraadt Exp $ */ /* * Copyright (c) 2002-2007 Bob Beck. All rights reserved. @@ -1451,8 +1451,7 @@ jail: close(conffd); conffd = -1; } - } - if (conffd != -1 && FD_ISSET(conffd, fdsr)) + } else if (conffd != -1 && FD_ISSET(conffd, fdsr)) do_config(); if (trapfd != -1 && FD_ISSET(trapfd, fdsr)) read_configline(trapcfg); |