sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-26 10:04:02 +03:00
Code

s3: Use localtime_r, libreplace defines it

Browse Source 
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Sat Nov 27 20:50:27 CET 2010 on sn-devel-104
This commit is contained in:
Volker Lendecke 2010-11-27 19:52:11 +01:00 committed by Volker Lendecke
parent 87c67433c8
commit 2f40657ab3
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/utils/net_cache.c
View File

@ -39,24 +39,22 @@ static void print_cache_entry(const char* keystr, const char* datastr,
char *timeout_str;
char *alloc_str = NULL;
time_t now_t = time(NULL);
struct tm timeout_tm, *now_tm;
/* localtime returns statically allocated pointer, so timeout_tm
has to be copied somewhere else */
struct tm timeout_tm, now_tm;
struct tm *ptimeout_tm, *pnow_tm;
now_tm = localtime(&timeout);
if (!now_tm) {
ptimeout_tm = localtime_r(&timeout, &timeout_tm);
if (ptimeout_tm == NULL) {
return;
}
memcpy(&timeout_tm, now_tm, sizeof(struct tm));
now_tm = localtime(&now_t);
if (!now_tm) {
pnow_tm = localtime_r(&now_t, &now_tm);
if (pnow_tm == NULL) {
return;
}
/* form up timeout string depending whether it's today's date or not */
if (timeout_tm.tm_year != now_tm->tm_year ||
timeout_tm.tm_mon != now_tm->tm_mon ||
timeout_tm.tm_mday != now_tm->tm_mday) {
if (timeout_tm.tm_year != now_tm.tm_year ||
timeout_tm.tm_mon != now_tm.tm_mon ||
timeout_tm.tm_mday != now_tm.tm_mday) {
timeout_str = asctime(&timeout_tm);
if (!timeout_str) {