From: David Hankins <dhankins@isc.org>
Date: Fri, 10 Sep 2010 22:04:19 +0000 (+0000)
Subject: - Two identical log messages for commit_leases() have been disambiguated.
X-Git-Tag: v4_3_0a1~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bd445a1c1a3965fffea8a27145a245b642ce389;p=thirdparty%2Fdhcp.git

- Two identical log messages for commit_leases() have been disambiguated.
  [ISC-Bugs #18915]
---

diff --git a/RELNOTES b/RELNOTES
index 230d27501..cad1c957f 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -100,6 +100,9 @@ work on other platforms. Please report any problems and suggested fixes to
   code to move most of the common code to a single routine.
   [ISC-Bugs #21171].
 
+- Two identical log messages for commit_leases() have been disambiguated.
+  [ISC-Bugs #18915]
+
 			Changes since 4.2.0b2
 
 - Add declaration for variable in debug code in alloc.c.  [ISC-Bugs #21472]
diff --git a/server/db.c b/server/db.c
index 9a903e04d..0b7ccf9fa 100644
--- a/server/db.c
+++ b/server/db.c
@@ -988,11 +988,11 @@ int commit_leases ()
 	   We need to do this even if we're rewriting the file below,
 	   just in case the rewrite fails. */
 	if (fflush (db_file) == EOF) {
-		log_info ("commit_leases: unable to commit: %m");
+		log_info ("commit_leases: unable to commit, fflush(): %m");
 		return 0;
 	}
 	if (fsync (fileno (db_file)) < 0) {
-		log_info ("commit_leases: unable to commit: %m");
+		log_info ("commit_leases: unable to commit, fsync(): %m");
 		return 0;
 	}