Pulled up rt16929

diff --git a/RELNOTES b/RELNOTES
index 01a6295b47fd833be418f0539015d3629d9a886f..c088ec2073a2011773a280e9d8c15e1f67e27668 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -59,6 +59,8 @@ suggested fixes to <dhcp-users@isc.org>.
 - A bug was fixed in interface discovery wherein an error identifying
   a server-configured interface with no IPv4 addresses would SEGV.
 
+- Fixed a bug in which write_lease() might report a failure incorrectly
+
                        Changes since 4.0.0-20070413
 
 - Old (expired) leases are now cleaned.

diff --git a/server/db.c b/server/db.c
index aa34e24ab65a41b6cf912980dae2bf08529793a2..d33104f7792b2eb16197ff92ab3370931b7f144c 100644 (file)
--- a/server/db.c
+++ b/server/db.c
@@ -34,7 +34,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: db.c,v 1.79 2007/05/29 18:11:56 each Exp $ Copyright (c) 2004-2007 Internet Systems Consortium.  All rights reserved.\n";
+"$Id: db.c,v 1.80 2007/06/05 23:28:43 each Exp $ Copyright (c) 2004-2007 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;