aboutsummaryrefslogtreecommitdiffstats
path: root/compat.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2007-11-29 22:46:43 -0800
committerWayne Davison <wayned@samba.org>2007-11-29 22:46:43 -0800
commit87de82f2d0ed8288e59aa311edd7b63d627bea3b (patch)
treea2ab4ed3d9958232ef6a1dd08ba1521a6086ac4e /compat.c
parent87531e6302dd9352730f29b4bde36b2b21d4038b (diff)
downloadandroid_external_rsync-87de82f2d0ed8288e59aa311edd7b63d627bea3b.tar.gz
android_external_rsync-87de82f2d0ed8288e59aa311edd7b63d627bea3b.tar.bz2
android_external_rsync-87de82f2d0ed8288e59aa311edd7b63d627bea3b.zip
Make sure that the inc_recurse value is always set to
either 0 or 1.
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/compat.c b/compat.c
index 95dd3074..c9581357 100644
--- a/compat.c
+++ b/compat.c
@@ -231,11 +231,12 @@ void setup_protocol(int f_out,int f_in)
exit_cleanup(RERR_PROTOCOL);
}
} else if (protocol_version >= 30) {
+ /* The inc_recurse var MUST be set to 0 or 1. */
if (am_server) {
- inc_recurse = allow_inc_recurse;
+ inc_recurse = allow_inc_recurse ? 1 : 0;
write_byte(f_out, inc_recurse);
} else
- inc_recurse = read_byte(f_in);
+ inc_recurse = read_byte(f_in) ? 1 : 0;
if (inc_recurse && !allow_inc_recurse) {
/* This should only be able to happen in a batch. */
fprintf(stderr,