[Pkg-shadow-commits] r2758 - in upstream/trunk: . libmisc

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-04-22 21:06:13 +0000 (Wed, 22 Apr 2009)
New Revision: 2758

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/libmisc/utmp.c
Log:
	* libmisc/utmp.c: Only set ut_time and ut_tv if gettimeofday()
	succeeds.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-22 21:04:16 UTC (rev 2757)
+++ upstream/trunk/ChangeLog	2009-04-22 21:06:13 UTC (rev 2758)
@@ -1,5 +1,10 @@
 2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* libmisc/utmp.c: Only set ut_time and ut_tv if gettimeofday()
+	succeeds.
+
+2009-04-22  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* libmisc/utmp.c: Fix the check for empty host in prepare_utmp()
 	and prepare_utmpx().
 

Modified: upstream/trunk/libmisc/utmp.c
===================================================================
--- upstream/trunk/libmisc/utmp.c	2009-04-22 21:04:16 UTC (rev 2757)
+++ upstream/trunk/libmisc/utmp.c	2009-04-22 21:06:13 UTC (rev 2758)
@@ -284,17 +284,18 @@
 	}
 	/* ut_exit is only for DEAD_PROCESS */
 	utent->ut_session = getsid (0);
-	gettimeofday (&tv, NULL);
+	if (gettimeofday (&tv, NULL) == 0) {
 #ifdef HAVE_STRUCT_UTMP_UT_TIME
-	utent->ut_time = tv.tv_sec;
+		utent->ut_time = tv.tv_sec;
 #endif				/* HAVE_STRUCT_UTMP_UT_TIME */
 #ifdef HAVE_STRUCT_UTMP_UT_XTIME
-	utent->ut_xtime = tv.tv_usec;
+		utent->ut_xtime = tv.tv_usec;
 #endif				/* HAVE_STRUCT_UTMP_UT_XTIME */
 #ifdef HAVE_STRUCT_UTMP_UT_TV
-	utent->ut_tv.tv_sec  = tv.tv_sec;
-	utent->ut_tv.tv_usec = tv.tv_usec;
+		utent->ut_tv.tv_sec  = tv.tv_sec;
+		utent->ut_tv.tv_usec = tv.tv_usec;
 #endif				/* HAVE_STRUCT_UTMP_UT_TV */
+	}
 
 	return utent;
 }
@@ -423,15 +424,16 @@
 	}
 	/* ut_exit is only for DEAD_PROCESS */
 	utxent->ut_session = getsid (0);
-	gettimeofday (&tv, NULL);
+	if (gettimeofday (&tv, NULL) == 0) {
 #ifdef HAVE_STRUCT_UTMPX_UT_TIME
-	utxent->ut_time = tv.tv_sec;
+		utxent->ut_time = tv.tv_sec;
 #endif				/* HAVE_STRUCT_UTMPX_UT_TIME */
 #ifdef HAVE_STRUCT_UTMPX_UT_XTIME
-	utxent->ut_xtime = tv.tv_usec;
+		utxent->ut_xtime = tv.tv_usec;
 #endif				/* HAVE_STRUCT_UTMPX_UT_XTIME */
-	utxent->ut_tv.tv_sec  = tv.tv_sec;
-	utxent->ut_tv.tv_usec = tv.tv_usec;
+		utxent->ut_tv.tv_sec  = tv.tv_sec;
+		utxent->ut_tv.tv_usec = tv.tv_usec;
+	}
 
 	return utxent;
 }