Changeset 389

Timestamp:

01/21/2010 13:35:56 (6 months ago)

Author:

diver

Message:

fixed ticket 112, removed unused files

Location:

branches/samba-3.3.x/source

Files:

• lib/tdb/common/patch.log (deleted)
• lib/tdb/common/tdb_private.h# (deleted)
• lib/tdb/common/transaction.c# (deleted)
• lib/tdb/patch.log (deleted)
• lib/tdb/tdb.diff (deleted)
• lib/tdb/tools/tdbtool.c (modified) (7 diffs)
• pkgconfig/netapi.pc (modified) (1 diff)
• pkgconfig/smbclient.pc (modified) (1 diff)
• pkgconfig/smbsharemodes.pc (modified) (1 diff)
• pkgconfig/wbclient.pc (modified) (1 diff)
• script/findsmb (modified) (2 diffs)
• smbadduser (modified) (1 diff)

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

@@ -37 +37 @@
 char cmdline[1024];
 static int disable_mmap;
+static bool createDbCmd;
 
 enum commands {
@@ -210 +211 @@
         if (tdb) tdb_close(tdb);
         tdb = tdb_open(tdbname, 0, disable_mmap?TDB_NOMMAP:0, O_RDWR, 0600);
+#ifdef __OS2__
+        if (!tdb && !createDbCmd) {
+#else
         if (!tdb) {
+#endif
                 printf("Could not open %s: %s\n", tdbname, strerror(errno));
         }
@@ -482 +487 @@
         enum commands mycmd = CMD_HELP;
         int cmd_len;
+
+#ifdef __OS2__
+    if (cmdname) {
+#endif
 
         if (cmdname && strlen(cmdname) == 0) {
@@ -495 +504 @@
             }
         }
+
+#ifdef __OS2__
+    }
+#endif
 
         switch (mycmd) {
@@ -640 +653 @@
     arg2len = 0;
 
-#if defined(__OS2__)
-    if (argv[1] && argc == 2) {
-#else
+#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]) {
-#endif
         cmdname = "open";
         arg1 = argv[1];
@@ -676 +697 @@
             }
             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);
@@ -690 +703 @@
         case 3:
                 cmdname = argv[2];
+        default:
+#ifdef __OS2__
+            if (!arg1) {
+               cmdname = NULL;
+            }
 #endif
-        default:
             do_command();
             break;

branches/samba-3.3.x/source/pkgconfig/netapi.pc

@@ -1 @@
-prefix=/samba
+prefix=/usr/local/samba
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

branches/samba-3.3.x/source/pkgconfig/smbclient.pc

@@ -1 @@
-prefix=/samba
+prefix=/usr/local/samba
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

branches/samba-3.3.x/source/pkgconfig/smbsharemodes.pc

@@ -1 @@
-prefix=/samba
+prefix=/usr/local/samba
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

branches/samba-3.3.x/source/pkgconfig/wbclient.pc

@@ -1 @@
-prefix=/samba
+prefix=/usr/local/samba
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib

branches/samba-3.3.x/source/script/findsmb

@@ -1 @@
-#!u:/Perl/bin/perl.exe
+#!e:/Perl/bin/perl.exe
 #
 # Prints info on all smb responding machines on a subnet.
@@ -21 +21 @@
 #
 
-$SAMBABIN = "/samba/bin";
+$SAMBABIN = "/usr/local/samba/bin";
 
 for ($i = 0; $i < 2; $i++) {    # test for -d and -r options

branches/samba-3.3.x/source/smbadduser

@@ -4 +4 @@
 #
 
-prefix=/samba
+prefix=/usr/local/samba
 exec_prefix=${prefix}
 LIBDIR=${exec_prefix}/lib