Changeset 355 for branches/samba-3.0

Timestamp:

Dec 29, 2009, 11:10:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #112 (tdbtool.exe crash) in 3.0.x

Location:

branches/samba-3.0/source

Files:

• include/version.h (modified) (1 diff)
• tdb/tools/tdbtool.c (modified) (2 diffs)

branches/samba-3.0/source/include/version.h

@@ -5 +5 @@
 #define SAMBA_VERSION_OFFICIAL_STRING "3.0.37"
 #define SAMBA_VERSION_VENDOR_SUFFIX "eCS 1.0.3"
-#define SAMBA_VERSION_VENDOR_PATCH 353
+#define SAMBA_VERSION_VENDOR_PATCH 354
 #define SAMBA_VERSION_STRING samba_version_string()

branches/samba-3.0/source/tdb/tools/tdbtool.c

@@ -645 +645 @@
     arg2 = NULL;
     arg2len = 0;
-
-    if (argv[1]) {
+#if defined(__OS2__)
+    if (argv[1] && argc == 2) {
+#else
+    if (argv[1])  {
+#endif
         cmdname = (char *) "open";
         arg1 = argv[1];
@@ -678 +681 @@
             }
             break;
+#if defined(__OS2__)
         case 5:
-            arg2 = convert_string(argv[4],&arg2len);
         case 4:
-            arg1 = convert_string(argv[3],&arg1len);
+                arg2 = convert_string(argv[3],&arg2len);
         case 3:
-            cmdname = argv[2];
+                arg1 = convert_string(argv[2],&arg1len);
+        cmdname = argv[1];
+#else
+        case 5:
+                arg2 = convert_string(argv[4],&arg2len);
+        case 4:
+                arg1 = convert_string(argv[3],&arg1len);
+        case 3:
+                cmdname = argv[2];
+#endif
+            
         default:
             do_command();