Don't force job duplicate checking on copy and migration jobs.

[bacula/bacula] / bacula / src / findlib / find.c

diff --git a/bacula/src/findlib/find.c b/bacula/src/findlib/find.c
index 45f2a67cef5358569526313c40bbdb61c1de1887..77ac196dabf57b33a94e31ff276227f6cf98666c 100644 (file)
--- a/bacula/src/findlib/find.c
+++ b/bacula/src/findlib/find.c
@@ -6,7 +6,7 @@
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or

-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public

    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 


@@ -15,7 +15,7 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
    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
+   You should have received a copy of the GNU Affero General Public License

    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.


@@ -121,10 +121,14 @@ get_win32_driveletters(FF_PKT *ff, char* szDrives)
 #if !defined(HAVE_WIN32)
    return 0;
 #endif
 #if !defined(HAVE_WIN32)
    return 0;
 #endif

+   int nCount;
+   /* Can be already filled by plugin, so check that everything
+    * is on upper case. TODO: can check for dupplicate?
+    */
+   for (nCount = 0; nCount < 27 && szDrives[nCount] ; nCount++) {
+      szDrives[nCount] = toupper(szDrives[nCount]);
+   }

 
 

-   szDrives[0] = 0; /* make empty */
-   int nCount = 0;
-    

    findFILESET *fileset = ff->fileset;
    if (fileset) {
       int i;
    findFILESET *fileset = ff->fileset;
    if (fileset) {
       int i;


@@ -441,7 +445,6 @@ static int our_callback(JCR *jcr, FF_PKT *ff, bool top_level)
    case FT_INVALIDFS:
    case FT_INVALIDDT:
    case FT_NOOPEN:
    case FT_INVALIDFS:
    case FT_INVALIDDT:
    case FT_NOOPEN:

-   case FT_REPARSE:

 //    return ff->file_save(jcr, ff, top_level);
 
    /* These items can be filtered */
 //    return ff->file_save(jcr, ff, top_level);
 
    /* These items can be filtered */


@@ -455,6 +458,8 @@ static int our_callback(JCR *jcr, FF_PKT *ff, bool top_level)
    case FT_FIFO:
    case FT_SPEC:
    case FT_DIRNOCHG:
    case FT_FIFO:
    case FT_SPEC:
    case FT_DIRNOCHG:

+   case FT_REPARSE:
+   case FT_JUNCTION:

       if (accept_file(ff)) {
          return ff->file_save(jcr, ff, top_level);
       } else {
       if (accept_file(ff)) {
          return ff->file_save(jcr, ff, top_level);
       } else {