From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Mon, 10 Mar 2014 07:47:54 +0000 (+0530)
Subject: Mark nscd service as forking in systemd service file (BZ #16639)
X-Git-Tag: upstream/2.30~7775
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8b4ff97413fc32ea7f817586bc682ff2cc34527b;p=external%2Fglibc.git

Mark nscd service as forking in systemd service file (BZ #16639)

Currently the nscd service is installed in systemd as a simple
service, which means that it is able to handle its own errors and does
not quit.  Since nscd does not fit that description, i.e. it can exit
on errors like, say, failing to parse nscd.conf, it should be declared
as forking instead.
---

diff --git a/ChangeLog b/ChangeLog
index 5266177..be60b95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-10  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+	[BZ #16639]
+	* nscd/nscd.service: Make service type forking.
+
 2014-03-03  Adhemerval Zanella  <azanella@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/power5+/fpu/s_modf.c (__modf): Fix to return correct
diff --git a/NEWS b/NEWS
index 35481c7..64a0500 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Version 2.20
 * The following bugs are resolved with this release:
 
   15347, 15804, 15894, 16447, 16532, 16545, 16574, 16600, 16609, 16610,
-  16611, 16613, 16623, 16632, 16670, 16674.
+  16611, 16613, 16623, 16632, 16639, 16670, 16674.
 
 * The am33 port, which had not worked for several years, has been removed
   from ports.
diff --git a/nscd/nscd.service b/nscd/nscd.service
index 99c7563..b7428a3 100644
--- a/nscd/nscd.service
+++ b/nscd/nscd.service
@@ -4,8 +4,8 @@
 Description=Name Service Cache Daemon
 
 [Service]
-Type=simple
-ExecStart=/usr/sbin/nscd --foreground
+Type=forking
+ExecStart=/usr/sbin/nscd
 ExecStop=/usr/sbin/nscd --shutdown
 ExecReload=/usr/sbin/nscd -i passwd
 ExecReload=/usr/sbin/nscd -i group