Changeset 673 for branches

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Samba Server 3.3: Fix for Ticket #182

Location:

branches/samba-3.3.x/source

Files:

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

branches/samba-3.3.x/source/lib/os2helper.c

@@ -1 @@
-/* This file contains helper functions for OS/2 - 
-   do not try to compile on other platforms! */
+/*  This file contains Samba helper functions for eComStation (OS/2) - 
+ *  do not try to compile on other platforms!
+ *  
+ *  Copyright (C) 2007-2011
+ *                Silvan Scherrer 
+ *                Yuri Dario
+ *                Paul Smedley
+ *                Herwig Bauernfeind
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
 
 #ifdef __OS2__
@@ -10 +30 @@
 #define INCL_DOSMISC
 #define INCL_DOSMODULEMGR
+
 #define INCL_DOSERRORS
 
@@ -16 +37 @@
 #include <stdlib.h>
 #include <errno.h>
+
 #include <types.h>
 #include <string.h>
@@ -503 +525 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif

branches/samba-3.3.x/source/utils/net_time.c

@@ -111 +111 @@
 
         if (t == 0) return -1;
-
+#ifdef __OS2__
+        /* 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
            roll your own. I'm putting this in as it works on a large number
@@ -119 +122 @@
         }
         result = system(cmd);
+
         if (result)
                 d_fprintf(stderr, "%s failed.  Error was (%s)\n",