[Pkg-shadow-commits] r3709 - in upstream/trunk: . lib

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2012-02-13 20:09:59 +0000 (Mon, 13 Feb 2012)
New Revision: 3709

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/lib/nscd.c
Log:
2012-02-13  Mike Frysinger  <vapier at gentoo.org>
	* lib/nscd.c: Add missing newline to error message.
	* lib/nscd.c: If nscd is installed but not in use, then running
	`nscd -i` will exit(1). We shouldn't warn in this case since this
	is not abnormal behavior.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2012-02-13 20:04:40 UTC (rev 3708)
+++ upstream/trunk/ChangeLog	2012-02-13 20:09:59 UTC (rev 3709)
@@ -1,5 +1,12 @@
 2012-02-13  Mike Frysinger  <vapier at gentoo.org>
 
+	* lib/nscd.c: Add missing newline to error message.
+	* lib/nscd.c: If nscd is installed but not in use, then running
+	`nscd -i` will exit(1). We shouldn't warn in this case since this
+	is not abnormal behavior.
+
+2012-02-13  Mike Frysinger  <vapier at gentoo.org>
+
 	* man/.gitignore: Add generate_mans.deps
 
 2012-02-13  Mike Frysinger  <vapier at gentoo.org>

Modified: upstream/trunk/lib/nscd.c
===================================================================
--- upstream/trunk/lib/nscd.c	2012-02-13 20:04:40 UTC (rev 3708)
+++ upstream/trunk/lib/nscd.c	2012-02-13 20:09:59 UTC (rev 3709)
@@ -39,8 +39,11 @@
 		/* nscd is not installed, or it is installed but uses an
 		   interpreter that is missing.  Probably the former. */
 		return 0;
+	} else if (code == 1) {
+		/* nscd is installed, but it isn't active. */
+		return 0;
 	} else if (code != 0) {
-		(void) fprintf (stderr, _("%s: nscd exited with status %d"),
+		(void) fprintf (stderr, _("%s: nscd exited with status %d\n"),
 		                Prog, code);
 		(void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog);
 		return -1;