Changeset 672

Timestamp:

Dec 6, 2011, 10:00:10 AM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Move fix for Ticket #182 to os2helper.c

Location:

trunk/server/source3

Files:

• lib/os2helper.c (modified) (4 diffs)
• utils/net_time.c (modified) (2 diffs)

trunk/server/source3/lib/os2helper.c

@@ -6 +6 @@
  *                Yuri Dario
  *                Paul Smedley
+ *                Herwig Bauernfeind
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -29 +30 @@
 #define INCL_DOSMISC
 #define INCL_DOSMODULEMGR
+#define INCL_DOSDATETIME
 #define INCL_DOSERRORS
 
@@ -35 +37 @@
 #include <stdlib.h>
 #include <errno.h>
+#include <time.h>
 #include <types.h>
 #include <string.h>
@@ -558 +561 @@
 }
 
+/* set date/time on OS/2 */
+int os2_setdatetime(time_t t)
+{
+        struct tm *tm;
+
+        tm = localtime(&t);
+        if (!tm) {
+                return -1;
+        }
+
+        DATETIME   DateTime = {0};
+        APIRET     rc       = NO_ERROR;
+
+        /* Get current date/time to properly fill structure */
+        rc = DosGetDateTime(&DateTime);
+        if (rc != NO_ERROR) {
+                return rc;
+        }
+
+        DateTime.year    = (USHORT) ((BYTE) tm->tm_year+1900);
+        DateTime.month   = (UCHAR) ((BYTE) tm->tm_mon+1);
+        DateTime.day     = (UCHAR) ((BYTE) tm->tm_mday);
+        DateTime.hours   = (UCHAR) ((BYTE) tm->tm_hour);
+        DateTime.minutes = (UCHAR) ((BYTE) tm->tm_min);
+        DateTime.seconds = (UCHAR) ((BYTE) tm->tm_sec);
+
+        rc = DosSetDateTime(&DateTime);  /* Update the date and time */
+
+        if (rc!= NO_ERROR) {
+                printf ("DosSetDateTime error : return code = %u\n", rc);
+        }
+        return rc;
+}
+
 #endif

trunk/server/source3/utils/net_time.c

@@ -20 +20 @@
 #include "utils/net.h"
 
-#ifdef __OS2__
-#define INCL_DOSDATETIME   /* Date and time values */
-#define INCL_DOSERRORS     /* DOS error values */
-#include <os2.h>
-#endif
-
 /*
   return the time on a server. This does not require any authentication
@@ -97 +91 @@
                                tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
 }
-
-#ifdef __OS2__
-/* set date/time on OS/2 */
-static int os2_setdatetime(time_t t)
-{
-        struct tm *tm;
-
-        tm = localtime(&t);
-        if (!tm) {
-                return -1;
-        }
-
-        DATETIME   DateTime = {0};      /* Structure to hold date/time info.   */
-        APIRET     rc       = NO_ERROR; /* Return code                         */
-
-        rc = DosGetDateTime(&DateTime); /* Get current date/time to fill structure */
-        if (rc != NO_ERROR) {
-                return rc;
-        }
-
-        DateTime.year    = (USHORT) ((BYTE) tm->tm_year+1900);
-        DateTime.month   = (UCHAR) ((BYTE) tm->tm_mon+1);
-        DateTime.day     = (UCHAR) ((BYTE) tm->tm_mday);
-        DateTime.hours   = (UCHAR) ((BYTE) tm->tm_hour);
-        DateTime.minutes = (UCHAR) ((BYTE) tm->tm_min);
-        DateTime.seconds = (UCHAR) ((BYTE) tm->tm_sec);
-
-        rc = DosSetDateTime(&DateTime);  /* Update the date and time */
-
-        if (rc!= NO_ERROR) {
-                printf ("DosSetDateTime error : return code = %u\n", rc);
-        }
-        return rc;
-}
-#endif
 
 int net_time_usage(struct net_context *c, int argc, const char **argv)