sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s4/server: simplify and replace bad portable gettimeofday by time

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>

Autobuild-User: Björn Jacke <bj@sernet.de>
Autobuild-Date: Mon Jun  6 12:58:26 CEST 2011 on sn-devel-104
This commit is contained in:
Björn Jacke 2011-06-05 21:32:11 +02:00 committed by Bjoern Jacke
parent 4778d35c34
commit 81e48dfa35
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
source4/smbd/server.c
View File

@ -178,13 +178,7 @@ _NORETURN_ static void max_runtime_handler(struct tevent_context *ev,
struct timeval t, void *private_data)
{
const char *binary_name = (const char *)private_data;
struct timeval tv;
struct timezone tz;
if (gettimeofday(&tv, &tz) == 0) {
DEBUG(0,("%s: maximum runtime exceeded - terminating, current ts: %d\n", binary_name, (int)tv.tv_sec));
} else {
DEBUG(0,("%s: maximum runtime exceeded - terminating\n", binary_name));
}
DEBUG(0,("%s: maximum runtime exceeded - terminating, current ts: %d\n", binary_name, time(NULL)));
exit(0);
}
@ -444,14 +438,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
discard_const(binary_name));
if (max_runtime) {
struct timeval tv;
struct timezone tz;
if (gettimeofday(&tv, &tz) == 0) {
DEBUG(0,("Called with maxruntime %d - current ts %d\n", max_runtime, (int)tv.tv_sec));
} else {
DEBUG(0,("Called with maxruntime %d\n", max_runtime));
}
DEBUG(0,("Called with maxruntime %d - current ts %d\n", max_runtime, time(NULL)));
tevent_add_timer(event_ctx, event_ctx,
timeval_current_ofs(max_runtime, 0),
max_runtime_handler,