emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

* libmisc/utmp.c: Only set ut_time and ut_tv if gettimeofday()

Browse Source 
succeeds.
This commit is contained in:
nekral-guest 2009-04-22 21:06:13 +00:00
parent e76a5df932
commit 620ee81b7e
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-04-22 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/utmp.c: Only set ut_time and ut_tv if gettimeofday()
succeeds.
2009-04-22 Nicolas François <nicolas.francois@centraliens.net> 2009-04-22 Nicolas François <nicolas.francois@centraliens.net>
* libmisc/utmp.c: Fix the check for empty host in prepare_utmp() * libmisc/utmp.c: Fix the check for empty host in prepare_utmp()

22
libmisc/utmp.c
View File

@ -284,17 +284,18 @@ struct utmp *prepare_utmp (const char *name,
} }
/* ut_exit is only for DEAD_PROCESS */ /* ut_exit is only for DEAD_PROCESS */
utent->ut_session = getsid (0); utent->ut_session = getsid (0);
gettimeofday (&tv, NULL); if (gettimeofday (&tv, NULL) == 0) {
#ifdef HAVE_STRUCT_UTMP_UT_TIME #ifdef HAVE_STRUCT_UTMP_UT_TIME
utent->ut_time = tv.tv_sec; utent->ut_time = tv.tv_sec;
#endif /* HAVE_STRUCT_UTMP_UT_TIME */ #endif /* HAVE_STRUCT_UTMP_UT_TIME */
#ifdef HAVE_STRUCT_UTMP_UT_XTIME #ifdef HAVE_STRUCT_UTMP_UT_XTIME
utent->ut_xtime = tv.tv_usec; utent->ut_xtime = tv.tv_usec;
#endif /* HAVE_STRUCT_UTMP_UT_XTIME */ #endif /* HAVE_STRUCT_UTMP_UT_XTIME */
#ifdef HAVE_STRUCT_UTMP_UT_TV #ifdef HAVE_STRUCT_UTMP_UT_TV
utent->ut_tv.tv_sec = tv.tv_sec; utent->ut_tv.tv_sec = tv.tv_sec;
utent->ut_tv.tv_usec = tv.tv_usec; utent->ut_tv.tv_usec = tv.tv_usec;
#endif /* HAVE_STRUCT_UTMP_UT_TV */ #endif /* HAVE_STRUCT_UTMP_UT_TV */
}
return utent; return utent;
} }
@ -423,15 +424,16 @@ struct utmpx *prepare_utmpx (const char *name,
} }
/* ut_exit is only for DEAD_PROCESS */ /* ut_exit is only for DEAD_PROCESS */
utxent->ut_session = getsid (0); utxent->ut_session = getsid (0);
gettimeofday (&tv, NULL); if (gettimeofday (&tv, NULL) == 0) {
#ifdef HAVE_STRUCT_UTMPX_UT_TIME #ifdef HAVE_STRUCT_UTMPX_UT_TIME
utxent->ut_time = tv.tv_sec; utxent->ut_time = tv.tv_sec;
#endif /* HAVE_STRUCT_UTMPX_UT_TIME */ #endif /* HAVE_STRUCT_UTMPX_UT_TIME */
#ifdef HAVE_STRUCT_UTMPX_UT_XTIME #ifdef HAVE_STRUCT_UTMPX_UT_XTIME
utxent->ut_xtime = tv.tv_usec; utxent->ut_xtime = tv.tv_usec;
#endif /* HAVE_STRUCT_UTMPX_UT_XTIME */ #endif /* HAVE_STRUCT_UTMPX_UT_XTIME */
utxent->ut_tv.tv_sec = tv.tv_sec; utxent->ut_tv.tv_sec = tv.tv_sec;
utxent->ut_tv.tv_usec = tv.tv_usec; utxent->ut_tv.tv_usec = tv.tv_usec;
}
return utxent; return utxent;
} }