[arch-commits] Commit in shadow/trunk (PKGBUILD nscd-error-reporting.patch)

[Dave Reisner]

    Date: Tuesday, February 14, 2012 @ 11:38:31
  Author: dreisner
Revision: 150201

upgpkg: shadow 4.1.5-3

- backport patch to avoid useless nscd errors

Added:
  shadow/trunk/nscd-error-reporting.patch
Modified:
  shadow/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    5 ++++-
 nscd-error-reporting.patch |   17 +++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-14 14:18:53 UTC (rev 150200)
+++ PKGBUILD	2012-02-14 16:38:31 UTC (rev 150201)
@@ -4,7 +4,7 @@
 
 pkgname=shadow
 pkgver=4.1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Password and account management tool suite with support for shadow files and PAM"
 arch=('i686' 'x86_64')
 url='http://pkg-shadow.alioth.debian.org/'
@@ -30,6 +30,7 @@
         passwd
         shadow.cron.daily
         useradd.defaults
+        nscd-error-reporting.patch
         xstrdup.patch
         shadow-strncpy-usage.patch
         shadow-add-missing-include.patch)
@@ -46,6 +47,7 @@
           '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
           '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
           '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
+          'ae6eebb842c433ac4022c493294a13ed68e06acc'
           '6010fffeed1fc6673ad9875492e1193b1a847b53'
           '21e12966a6befb25ec123b403cd9b5c492fe5b16'
           '0697a21f7519de30821da7772677035652df4ad2')
@@ -62,6 +64,7 @@
   patch -Np1 <"$srcdir/xstrdup.patch"
   patch -Np1 <"$srcdir/shadow-strncpy-usage.patch"
   patch -Np1 <"$srcdir/shadow-add-missing-include.patch"
+  patch -Np1 <"$srcdir/nscd-error-reporting.patch"
 
   # supress etc/pam.d/*, we provide our own
   sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in

Added: nscd-error-reporting.patch
===================================================================
--- nscd-error-reporting.patch	                        (rev 0)
+++ nscd-error-reporting.patch	2012-02-14 16:38:31 UTC (rev 150201)
@@ -0,0 +1,17 @@
+diff --git a/upstream/trunk/lib/nscd.c b/upstream/trunk/lib/nscd.c
+index 227c205..7adb58f 100644
+--- a/lib/nscd.c
++++ b/lib/nscd.c
+@@ -39,8 +39,11 @@ int nscd_flush_cache (const char *service)
+ 		/* 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;