summaryrefslogtreecommitdiff
path: root/sender.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-04-12 12:51:20 -0700
committerWayne Davison <wayned@samba.org>2009-04-12 12:51:20 -0700
commitd510e82fc6503bfb56212eda9d9b6d4d1896331a (patch)
treeb274508799e2b48448ffe744bdf854ff5187e2fb /sender.c
parent4e9c7fae8f6feb2fecaea811b318cf416d23dd9a (diff)
downloadrsync-d510e82fc6503bfb56212eda9d9b6d4d1896331a.tar.gz
Fixed the use of --xattrs with --only-write-batch.
Diffstat (limited to 'sender.c')
-rw-r--r--sender.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sender.c b/sender.c
index bf8221de..cc2c9e90 100644
--- a/sender.c
+++ b/sender.c
@@ -22,7 +22,6 @@
#include "rsync.h"
#include "inums.h"
-extern int dry_run;
extern int do_xfers;
extern int am_server;
extern int am_daemon;
@@ -152,7 +151,7 @@ static void write_ndx_and_attrs(int f_out, int ndx, int iflags,
if (iflags & ITEM_XNAME_FOLLOWS)
write_vstring(f_out, buf, len);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
send_xattr_request(fname, file, f_out);
#endif
}
@@ -226,7 +225,7 @@ void send_files(int f_in, int f_out)
rprintf(FINFO, "send_files(%d, %s%s%s)\n", ndx, path,slash,fname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && !dry_run)
+ if (preserve_xattrs && iflags & ITEM_REPORT_XATTR && do_xfers)
recv_xattr_request(file, f_in);
#endif