Changeset 356 for branches/samba-3.3.x/source

Timestamp:

Dec 29, 2009, 11:26:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

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

Location:

branches/samba-3.3.x/source

Files:

• VERSION (modified) (1 diff)
• lib/tdb/tools/tdbtool.c (modified) (2 diffs)

branches/samba-3.3.x/source/VERSION

@@ -85 +85 @@
 #                                                      #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX="eCS 1.1beta4"
+SAMBA_VERSION_VENDOR_SUFFIX=
 SAMBA_VERSION_VENDOR_PATCH=
 

branches/samba-3.3.x/source/lib/tdb/tools/tdbtool.c

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