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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-01-01 14:34:07 +0000 (Tue, 01 Jan 2008)
New Revision: 1597

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/useradd.c
Log:
Avoid ?: construct without the middle term.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-01-01 14:32:41 UTC (rev 1596)
+++ upstream/trunk/ChangeLog	2008-01-01 14:34:07 UTC (rev 1597)
@@ -1,5 +1,9 @@
 2008-01-01  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/useradd.c: Avoid ?: construct without the middle term.
+
+2008-01-01  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/copydir.c, src/usermod.c, lib/prototypes.h: The uid and
 	gid parameters can be set to -1 to indicate that the original
 	owners must be kept. Change the types from uid_t/gid_t to a

Modified: upstream/trunk/src/useradd.c
===================================================================
--- upstream/trunk/src/useradd.c	2008-01-01 14:32:41 UTC (rev 1596)
+++ upstream/trunk/src/useradd.c	2008-01-01 14:34:07 UTC (rev 1597)
@@ -1535,7 +1535,10 @@
 	mode_t mode;
 
 	if (strcasecmp (create_mail_spool, "yes") == 0) {
-		spool = getdef_str ("MAIL_DIR") ? : "/var/mail";
+		spool = getdef_str ("MAIL_DIR");
+		if (NULL == spool) {
+			spool = "/var/mail";
+		}
 		file = alloca (strlen (spool) + strlen (user_name) + 2);
 		sprintf (file, "%s/%s", spool, user_name);
 		fd = open (file, O_CREAT | O_WRONLY | O_TRUNC | O_EXCL, 0);