From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 5 Oct 2007 21:12:46 +0000 (+0000)
Subject: [BZ #5112]
X-Git-Tag: upstream/2.20~7624
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e6ce4d77e489c7ca333c6b56b1386b20927f678;p=platform%2Fupstream%2Flinaro-glibc.git

[BZ #5112]

	* nscd/connections.c (restart): Don't resync if database is
	disabled.  Patch mostly by Brian De Wolf <bldewolf@csupomona.edu>.
---

diff --git a/ChangeLog b/ChangeLog
index 6458366..a1ba69b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-10-05  Ulrich Drepper  <drepper@redhat.com>
 
+	[BZ #5112]
+	* nscd/connections.c (restart): Don't resync if database is
+	disabled.  Patch mostly by Brian De Wolf <bldewolf@csupomona.edu>.
+
 	* sysdeps/gnu/netinet/tcp.h: Define TCP_MD5SIG, TCP_MD5SIG_MAXKEYLEN,
 	struct tcp_md5sig.  Extend struct tcp_info according to recent kernels.
 
diff --git a/nscd/connections.c b/nscd/connections.c
index 11fbc03..0687a26 100644
--- a/nscd/connections.c
+++ b/nscd/connections.c
@@ -1284,14 +1284,15 @@ cannot change to old working directory: %s; disabling paranoia mode"),
 
   /* Synchronize memory.  */
   for (int cnt = 0; cnt < lastdb; ++cnt)
-    {
-      /* Make sure nobody keeps using the database.  */
-      dbs[cnt].head->timestamp = 0;
+    if (!dbs[cnt].enabled)
+      {
+	/* Make sure nobody keeps using the database.  */
+	dbs[cnt].head->timestamp = 0;
 
-      if (dbs[cnt].persistent)
-	// XXX async OK?
-	msync (dbs[cnt].head, dbs[cnt].memsize, MS_ASYNC);
-    }
+	if (dbs[cnt].persistent)
+	  // XXX async OK?
+	  msync (dbs[cnt].head, dbs[cnt].memsize, MS_ASYNC);
+      }
 
   /* The preparations are done.  */
   execv ("/proc/self/exe", argv);