summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Hunt <each@isc.org>2007-06-05 23:30:25 +0000
committerEvan Hunt <each@isc.org>2007-06-05 23:30:25 +0000
commit458d036e67bfa78da8a8cf57c6b9bc4152f26bf7 (patch)
tree0b8408836fe268c54df145bcb92ffe08e0c121cc
parentfb23aab15b0182ed85bde37adc8c0f0353d27f53 (diff)
downloadisc-dhcp-458d036e67bfa78da8a8cf57c6b9bc4152f26bf7.tar.gz
Pull up rt16929
-rw-r--r--RELNOTES2
-rw-r--r--server/db.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/RELNOTES b/RELNOTES
index 9938f2a5..718e3b0c 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -40,6 +40,8 @@ the README file.
This enforces the correct sequence of events for the remote server
processing these messages.
+- Fixed a bug in which write_lease() might report a failure incorrectly
+
Changes since 3.1.0b1
- Added -x option to dhclient, which triggers dhclient processes
diff --git a/server/db.c b/server/db.c
index e743df74..48591ee8 100644
--- a/server/db.c
+++ b/server/db.c
@@ -34,7 +34,7 @@
#ifndef lint
static char copyright[] =
-"$Id: db.c,v 1.74.32.2 2007/05/29 17:49:44 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
+"$Id: db.c,v 1.74.32.3 2007/06/05 23:30:25 each Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -147,6 +147,7 @@ int write_lease (lease)
int i;
s = quotify_buf (lease -> uid, lease -> uid_len, MDL);
if (s) {
+ errno = 0;
fprintf (db_file, "\n uid \"%s\";", s);
if (errno)
++errors;