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

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

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 53dc20d6367c43217014b0dd39ef4bbf7b550d0f..6acccd14ae4c9888d00e08647b7c14ba931ea36a 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -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,