diff options
| author | Ted Lemon <source@isc.org> | 2000-09-01 16:57:44 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-09-01 16:57:44 +0000 |
| commit | d642c2a6acb65dd6ba20fa7e39c8886293eaeb15 (patch) | |
| tree | b7f9a9a196a3ed0363b1d4dceb36692e4e5eda8f | |
| parent | b19f2e1c315efcdad916ea117f5c098c737f30c0 (diff) | |
| download | isc-dhcp-d642c2a6acb65dd6ba20fa7e39c8886293eaeb15.tar.gz | |
Get rid of an unnecessary test.
| -rw-r--r-- | server/dhcp.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/server/dhcp.c b/server/dhcp.c index 6ff4ee1e..86ca626b 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.162 2000/08/31 04:40:55 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.163 2000/09/01 16:57:44 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -2697,12 +2697,11 @@ int find_lease (struct lease **lp, ip_lease -> uid_len != client_identifier.len || memcmp (ip_lease -> uid, client_identifier.data, ip_lease -> uid_len)) : - (!ip_lease -> uid && - (ip_lease -> hardware_addr.hbuf [0] != packet -> raw -> htype || - ip_lease -> hardware_addr.hlen != packet -> raw -> hlen + 1 || - memcmp (&ip_lease -> hardware_addr.hbuf [1], - packet -> raw -> chaddr, - (unsigned)(ip_lease -> hardware_addr.hlen - 1)))))) { + (ip_lease -> hardware_addr.hbuf [0] != packet -> raw -> htype || + ip_lease -> hardware_addr.hlen != packet -> raw -> hlen + 1 || + memcmp (&ip_lease -> hardware_addr.hbuf [1], + packet -> raw -> chaddr, + (unsigned)(ip_lease -> hardware_addr.hlen - 1))))) { /* If we're not doing failover, the only state in which we can allocate this lease to the client is FTS_FREE. If we are doing failover, things are more complicated. */ |