Changeset 745 for trunk/server/source3/utils/net_time.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/utils/net_time.c (modified) (2 diffs)

trunk/server/source3/utils/net_time.c

@@ -19 +19 @@
 #include "includes.h"
 #include "utils/net.h"
+#include "libsmb/nmblib.h"
+#include "libsmb/libsmb.h"
 
 /*
@@ -104 +106 @@
 }
 
-/* try to set the system clock using /bin/date */
+/* try to set the system clock */
 static int net_time_set(struct net_context *c, int argc, const char **argv)
 {
-        time_t t = nettime(c, NULL);
-        char *cmd;
+        struct timeval tv;
         int result;
 
-        if (t == 0) return -1;
+        tv.tv_sec = nettime(c, NULL);
+        tv.tv_usec=0;
+
+        if (tv.tv_sec == 0) return -1;
 
 #ifdef __OS2__
         /* eCS (OS/2) native "net time set" routine */
-        result = os2_setdatetime(t);
+        result = os2_setdatetime(tv.tv_sec);
 #else
-        /* yes, I know this is cheesy. Use "net time system" if you want to
-           roll your own. I'm putting this in as it works on a large number
-           of systems and the user has a choice in whether its used or not */
-        if (asprintf(&cmd, "/bin/date %s", systime(t)) == -1) {
-                return -1;
-        }
-        result = system(cmd);
+        result = settimeofday(&tv,NULL);
 #endif
+
         if (result)
-                d_fprintf(stderr, _("%s failed.  Error was (%s)\n"),
-                        cmd, strerror(errno));
-        free(cmd);
+                d_fprintf(stderr, _("setting system clock failed.  Error was (%s)\n"),
+                        strerror(errno));
 
         return result;