Changeset 670

Timestamp:

Dec 3, 2011, 4:23:50 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Cheesy Samba-like fix for Ticket #182

File:

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

trunk/server/source3/utils/net_time.c

@@ -20 +20 @@
 #include "utils/net.h"
 
+#ifdef __OS2__
+#define INCL_DOSNLS        /* National Language Support values */
+#define INCL_DOSERRORS     /* DOS error values */
+#include <os2.h>
+#endif
+
 /*
   return the time on a server. This does not require any authentication
@@ -91 +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)
+{
+        struct tm *tm;
+
+        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);
+
+        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 */
+}
+#endif
 
 int net_time_usage(struct net_context *c, int argc, const char **argv)
@@ -113 +180 @@
         if (t == 0) return -1;
 
+#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));
+#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
@@ -123 +209 @@
                 d_fprintf(stderr, _("%s failed.  Error was (%s)\n"),
                         cmd, strerror(errno));
+#endif
         free(cmd);