[debian-edu-commits] r82191 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-21 12:08:16 +0000 (Wed, 21 Aug 2013)
New Revision: 82191

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/gosa-create
Log:
Make sure gosa-create ignore errors from nscd, as the calls will
fail if nscd isn't running, and in that case we do not need to
invalidate the caches (Closes: #720396).

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-08-21 11:20:46 UTC (rev 82190)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-08-21 12:08:16 UTC (rev 82191)
@@ -5,6 +5,11 @@
     http://wpad/wpad.dat for proxy settings (ProxyType=2) instead of
     depending on KDE to find the proxy on its own (ProxyType=3).
 
+  [ Petter Reinholdtsen ]
+  * Make sure gosa-create ignore errors from nscd, as the calls will
+    fail if nscd isn't running, and in that case we do not need to
+    invalidate the caches (Closes: #720396).
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 20 Aug 2013 21:06:57 +0200
 
 debian-edu-config (1.713) unstable; urgency=low

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/gosa-create
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/gosa-create	2013-08-21 11:20:46 UTC (rev 82190)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/gosa-create	2013-08-21 12:08:16 UTC (rev 82191)
@@ -33,8 +33,10 @@
             test -e "$HOMEDIR" && continue 
     	    cp -r /etc/skel $HOMEDIR
             if type nscd > /dev/null 2>&1 ; then
-                nscd -i passwd
-                nscd -i group
+                # These calls fail when nscd isn't running.  And then we do
+                # not care about the result, as there is no cache to invalidate.
+                nscd -i passwd || true
+                nscd -i group || true
             fi
     	    chown -R $USERID:$GROUPID $HOMEDIR
 	    kadmin.local -q "add_principal -policy users -randkey -x $USERDN $USERID"