Changeset 671

Timestamp:

Dec 3, 2011, 4:41:18 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Fix for Ticket #182 via OS/2 API call

File:

• trunk/server/source3/utils/net_time.c (modified) (5 diffs)

trunk/server/source3/utils/net_time.c

@@ -21 +21 @@
 
 #ifdef __OS2__
-#define INCL_DOSNLS        /* National Language Support values */
+#define INCL_DOSDATETIME   /* Date and time values */
 #define INCL_DOSERRORS     /* DOS error values */
 #include <os2.h>
@@ -97 +97 @@
                                tm->tm_min, tm->tm_year + 1900, tm->tm_sec);
 }
+
 #ifdef __OS2__
-/* return time as a string ready to be passed to cmd time command */
-static const char *os2_systime(time_t t)
+/* set date/time on OS/2 */
+static int os2_setdatetime(time_t t)
 {
         struct tm *tm;
@@ -105 +106 @@
         tm = localtime(&t);
         if (!tm) {
-                return "unknown";
-        }
-
-        return talloc_asprintf(talloc_tos(), "%02d:%02d:%02d",
-                               tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-/* return a date as a string ready to be passed to cmd date command */
-static const char *os2_sysdate(time_t t)
-{
-        struct tm *tm;
-
-        tm = localtime(&t);
-        if (!tm) {
-                return "unknown";
-        }
-
-        COUNTRYCODE  Country    = {0};   /* Country code info (0 = current country) */
-        COUNTRYINFO  CtryInfo   = {0};   /* Buffer for country-specific information */
-        ULONG        ulInfoLen  = 0;
-        APIRET       rc         = NO_ERROR;  /* Return code                         */
-
-        rc = DosQueryCtryInfo(sizeof(CtryInfo), &Country, &CtryInfo, &ulInfoLen);
-
+                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) {
-                printf("DosQueryCtryInfo error: return code = %u\n",rc);
-                return talloc_asprintf(talloc_tos(), "%02d.%02d.%04d",
-                        tm->tm_mon+1, tm->tm_mday, tm->tm_year + 1900);
-        }
-        switch (CtryInfo.fsDateFmt) {
-                case(1): /* dd/mm/yy */
-                        return talloc_asprintf(talloc_tos(), "%02d%s%02d%s%04d",
-                                   tm->tm_mday,  CtryInfo.szDateSeparator,
-                                   tm->tm_mon+1, CtryInfo.szDateSeparator,
-                                   tm->tm_year + 1900);
-                break;
-
-                case(2): /* yy/mm/dd */
-                        return talloc_asprintf(talloc_tos(), "%04d%s%02d%s%02d",
-                                   tm->tm_year + 1900, CtryInfo.szDateSeparator,
-                                   tm->tm_mon+1,       CtryInfo.szDateSeparator,
-                                   tm->tm_mday);
-                break;
-
-                default: /* mm/dd/yy */
-                        return talloc_asprintf(talloc_tos(), "%02d%s%02d%s%04d",
-                                   tm->tm_mday,  CtryInfo.szDateSeparator, 
-                                   tm->tm_mon+1, CtryInfo.szDateSeparator, 
-                                   tm->tm_year + 1900);
-                break;
-        } /* endswitch */
+                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
@@ -181 +155 @@
 
 #ifdef __OS2__
-        /* eCS (OS/2) "net time set" routine */
-        /* First we set the time using cmd internal time command */
-        if (asprintf(&cmd, "time %s", os2_systime(t)) == -1) {
-                return -1;
-        }
-        result = system(cmd);
-        if (result)
-                d_fprintf(stderr, _("eCS (OS/2) time set: %s failed.  Error was (%s)\n"),
-                        cmd, strerror(errno));
-        /* Then we set the date using cmd internal date command */
-        if (asprintf(&cmd, "date %s", os2_sysdate(t)) == -1) {
-                return -1;
-        }
-        result = system(cmd);
-        if (result)
-                d_fprintf(stderr, _("eCS (OS/2) date set: %s failed.  Error was (%s)\n"),
-                        cmd, strerror(errno));
+        /* eCS (OS/2) native "net time set" routine */
+        result = os2_setdatetime(t);
 #else
         /* yes, I know this is cheesy. Use "net time system" if you want to
@@ -206 +165 @@
         }
         result = system(cmd);
+#endif
         if (result)
                 d_fprintf(stderr, _("%s failed.  Error was (%s)\n"),
                         cmd, strerror(errno));
-#endif
         free(cmd);