about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2014-03-10 13:17:54 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2014-03-10 13:17:54 +0530
commit8b4ff97413fc32ea7f817586bc682ff2cc34527b (patch)
tree6841941a1ed0ff7c30c0b68fffd9cc9b6e981378
parent54b46a4b3efd179ccbbf8e342e64391e2b590f1b (diff)
downloadglibc-8b4ff97413fc32ea7f817586bc682ff2cc34527b.tar.gz
glibc-8b4ff97413fc32ea7f817586bc682ff2cc34527b.tar.xz
glibc-8b4ff97413fc32ea7f817586bc682ff2cc34527b.zip
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.
-rw-r--r--ChangeLog5
-rw-r--r--NEWS2
-rw-r--r--nscd/nscd.service4
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 526617720f..be60b95db1 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 35481c75c8..64a05000b0 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 99c7563990..b7428a3613 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