[Pkg-shadow-commits] r1355 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2007-11-16 23:39:42 +0000 (Fri, 16 Nov 2007)
New Revision: 1355

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/useradd.c
   upstream/trunk/src/userdel.c
   upstream/trunk/src/usermod.c
Log:
Inform the user if out of memory while updating a group database.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2007-11-16 23:29:41 UTC (rev 1354)
+++ upstream/trunk/ChangeLog	2007-11-16 23:39:42 UTC (rev 1355)
@@ -1,5 +1,10 @@
 2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/userdel.c, src/usermod.c, src/useradd.c: Inform the user if
+	out of memory while updating a group database.
+
+2007-11-17  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, src/usermod.c: Update the group database before flushing
 	the nscd caches.
 

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2007-11-16 23:29:41 UTC (rev 1354)
+++ upstream/trunk/src/useradd.c	2007-11-16 23:39:42 UTC (rev 1355)
@@ -727,6 +727,9 @@
 		 */
 		ngrp = __gr_dup (grp);
 		if (!ngrp) {
+			fprintf (stderr,
+				 _("%s: Out of memory. Cannot update the group database.\n"),
+				 Prog);
 			fail_exit (E_GRP_UPDATE);	/* XXX */
 		}
 
@@ -775,6 +778,9 @@
 		 */
 		nsgrp = __sgr_dup (sgrp);
 		if (!nsgrp) {
+			fprintf (stderr,
+				 _("%s: Out of memory. Cannot update the shadow group database.\n"),
+				 Prog);
 			fail_exit (E_GRP_UPDATE);	/* XXX */
 		}
 

Modified: upstream/trunk/src/userdel.c
===================================================================
--- upstream/trunk/src/userdel.c	2007-11-16 23:29:41 UTC (rev 1354)
+++ upstream/trunk/src/userdel.c	2007-11-16 23:39:42 UTC (rev 1355)
@@ -150,6 +150,9 @@
 		 */
 		ngrp = __gr_dup (grp);
 		if (!ngrp) {
+			fprintf (stderr,
+				 _("%s: Out of memory. Cannot update the group database.\n"),
+				 Prog);
 			exit (13);	/* XXX */
 		}
 		ngrp->gr_mem = del_list (ngrp->gr_mem, user_name);
@@ -245,6 +248,9 @@
 
 		nsgrp = __sgr_dup (sgrp);
 		if (!nsgrp) {
+			fprintf (stderr,
+				 _("%s: Out of memory. Cannot update the shadow group database.\n"),
+				 Prog);
 			exit (13);	/* XXX */
 		}
 

Modified: upstream/trunk/src/usermod.c
===================================================================
--- upstream/trunk/src/usermod.c	2007-11-16 23:29:41 UTC (rev 1354)
+++ upstream/trunk/src/usermod.c	2007-11-16 23:39:42 UTC (rev 1355)
@@ -574,7 +574,7 @@
 		ngrp = __gr_dup (grp);
 		if (!ngrp) {
 			fprintf (stderr,
-				 _("%s: out of memory in update_group\n"),
+				 _("%s: Out of memory. Cannot update the group database.\n"),
 				 Prog);
 			gr_unlock ();
 			return -1;
@@ -696,8 +696,7 @@
 		nsgrp = __sgr_dup (sgrp);
 		if (!nsgrp) {
 			fprintf (stderr,
-				 _
-				 ("%s: out of memory in update_gshadow\n"),
+				 _("%s: Out of memory. Cannot update the shadow group database.\n"),
 				 Prog);
 			sgr_unlock ();
 			return -1;