diff options
author | Ted Lemon <source@isc.org> | 1997-02-22 12:25:11 +0000 |
---|---|---|
committer | Ted Lemon <source@isc.org> | 1997-02-22 12:25:11 +0000 |
commit | e6e5d8749e9c6f610d1e4cd98229c9a0e8635dfb (patch) | |
tree | 5aa2ad961948386ee9ba901f29e69b2e25c09910 | |
parent | 2fe35fcf419258d2cda4a2827c930e6426f359f5 (diff) | |
download | isc-dhcp-e6e5d8749e9c6f610d1e4cd98229c9a0e8635dfb.tar.gz |
Don't NAK leases from competing servers
-rw-r--r-- | dhcp.c | 8 | ||||
-rw-r--r-- | server/dhcp.c | 8 |
2 files changed, 8 insertions, 8 deletions
@@ -3,7 +3,7 @@ DHCP Protocol engine. */ /* - * Copyright (c) 1995, 1996 The Internet Software Consortium. + * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.39 1997/02/22 10:22:05 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.40 1997/02/22 12:25:11 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -191,9 +191,9 @@ void dhcprequest (packet) : packet -> interface -> name); /* If we found a lease for the client but it's not the one the - client asked for, NAK it. */ + client asked for, don't send it - some other server probably + made the cut. */ if (lease && !addr_eq (lease -> ip_addr, cip)) { - nak_lease (packet, &cip); return; } diff --git a/server/dhcp.c b/server/dhcp.c index 3e017d46..ec0ff916 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -3,7 +3,7 @@ DHCP Protocol engine. */ /* - * Copyright (c) 1995, 1996 The Internet Software Consortium. + * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -42,7 +42,7 @@ #ifndef lint static char copyright[] = -"$Id: dhcp.c,v 1.39 1997/02/22 10:22:05 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; +"$Id: dhcp.c,v 1.40 1997/02/22 12:25:11 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -191,9 +191,9 @@ void dhcprequest (packet) : packet -> interface -> name); /* If we found a lease for the client but it's not the one the - client asked for, NAK it. */ + client asked for, don't send it - some other server probably + made the cut. */ if (lease && !addr_eq (lease -> ip_addr, cip)) { - nak_lease (packet, &cip); return; } |