Can just test ignore_errors w/o lp_ignore_errors(module_id) now.
authorWayne Davison <wayned@samba.org>
Mon, 25 Dec 2006 17:49:23 +0000 (17:49 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 25 Dec 2006 17:49:23 +0000 (17:49 +0000)
flist.c
generator.c

diff --git a/flist.c b/flist.c
index cfa9beac61b46126a6b8ea17a547bf1c2dce2cec..a7eecc8e576083c270146bb9ed73a9089e286947 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -1436,7 +1436,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
                send_uid_list(f);
 
        /* send the io_error flag */
-       write_int(f, lp_ignore_errors(module_id) ? 0 : io_error);
+       write_int(f, ignore_errors ? 0 : io_error);
 
        io_end_buffering();
        stats.flist_size = stats.total_written - start_write;
@@ -1505,7 +1505,7 @@ struct file_list *recv_file_list(int f)
                recv_uid_list(f, flist);
 
                /* Recv the io_error flag */
-               if (lp_ignore_errors(module_id) || ignore_errors)
+               if (ignore_errors)
                        read_int(f);
                else
                        io_error |= read_int(f);
index 0721790df6caeb07695b8a46359ad919e39e4682..f17faed5dc28893dc3653e66bbcdcbf24d74c829 100644 (file)
@@ -433,7 +433,7 @@ static void delete_in_dir(struct file_list *flist, char *fbuf,
        if (F_DEPTH(file) >= MAXPATHLEN/2+1)
                return; /* Impossible... */
 
-       if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
+       if (io_error && !ignore_errors) {
                if (already_warned)
                        return;
                rprintf(FINFO,