From 55310f6fccbef1dedd516266582cb1d8d7fa16f9 Mon Sep 17 00:00:00 2001
From: Lukas Oyen <oyen@univention.de>
Date: Tue, 13 Dec 2016 16:31:16 +0100
Subject: [PATCH] Bug #40371: nscd init script: move cache invalidation after
 restart

---
 base/univention-base-files/conffiles/etc/init.d/nscd | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/base/univention-base-files/conffiles/etc/init.d/nscd b/base/univention-base-files/conffiles/etc/init.d/nscd
index e2c9085..0ed3ba7 100755
--- a/base/univention-base-files/conffiles/etc/init.d/nscd
+++ b/base/univention-base-files/conffiles/etc/init.d/nscd
@@ -88,6 +88,13 @@ status()
 	return 0
 }
 
+invalidate_cache()
+{
+	for table in passwd group hosts ; do
+		$DAEMON --invalidate $table
+	done
+}
+
 case "$1" in
 start)
 	log_daemon_msg "Starting $DESC" "$NAME"
@@ -109,15 +116,12 @@ stop)
 	;;
 restart|force-reload|reload)
 	log_daemon_msg "Restarting $DESC" "$NAME"
-	for table in passwd group hosts ; do
-		$DAEMON --invalidate $table
-	done
 	stop_nscd
 	case "$?" in
 	0|1)
 		start_nscd
 		case "$?" in
-			0) log_end_msg 0 ; exit 0 ;;
+			0) invalidate_cache; log_end_msg 0 ; exit 0 ;;
 			1) log_failure_msg " (failed -- old process is still running)." ; exit 1 ;;
 			*) log_failure_msg " (failed to start)." ; exit 1 ;;
 		esac
-- 
2.7.4