Changeset 907 for trunk/server

Timestamp:

May 19, 2016, 4:13:56 PM (9 years ago)

Author:

dmik

Message:

tdb: Restore vendor version of tdbtool.

This effectively reverts r356, r391 and r392 (see #112). Seems not to be
necessary with the recent Samba and kLIBC.

File:

• trunk/server/lib/tdb/tools/tdbtool.c (modified) (6 diffs)

trunk/server/lib/tdb/tools/tdbtool.c

@@ -37 +37 @@
 char cmdline[1024];
 static int disable_mmap;
-
-#ifdef __OS2__
-static bool createDbCmd;
-#endif
 
 enum commands {
@@ -243 +239 @@
         tdb = tdb_open_ex(tdbname, 0, disable_mmap?TDB_NOMMAP:0, O_RDWR, 0600,
                           &log_ctx, NULL);
-#ifdef __OS2__
-        if (!tdb && !createDbCmd) {
-#else
         if (!tdb) {
-#endif
                 printf("Could not open %s: %s\n", tdbname, strerror(errno));
         }
@@ -573 +565 @@
         int cmd_len;
 
-#ifdef __OS2__
-    if (cmdname) {
-#endif
         if (cmdname && strlen(cmdname) == 0) {
                 mycmd = CMD_NEXT;
@@ -588 +577 @@
                 }
         }
-#ifdef __OS2__
-   }
-#endif
 
         switch (mycmd) {
@@ -746 +732 @@
         arg2 = NULL;
         arg2len = 0;
-
-#ifdef __OS2__
-        int cnt = 1;
-        createDbCmd = false;
-        while (argv[cnt]) {
-                if (strncmp("create",argv[cnt],6) == 0) {
-                        createDbCmd = true;
-                        break;
-                }
-                cnt++;
-        }
-#endif
 
         if (argv[1]) {
@@ -798 +772 @@
                 cmdname = argv[2];
         default:
-#ifdef __OS2__
-            if (argc == 3) {
-               arg1 = convert_string(argv[1], &arg1len);
-            }
-#endif
                 do_command();
                 break;