Don't let --chmod tweak a 0 mode value (which marks a missing arg).
authorWayne Davison <wayned@samba.org>
Sat, 7 Mar 2009 06:41:23 +0000 (22:41 -0800)
committerMatt McCutchen <matt@mattmccutchen.net>
Fri, 13 Nov 2009 18:08:16 +0000 (13:08 -0500)
flist.c

diff --git a/flist.c b/flist.c
index c0550ec..f7bd1aa 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -767,7 +767,7 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
        if (!(xflags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
 
-       if (chmod_modes && !S_ISLNK(mode))
+       if (chmod_modes && !S_ISLNK(mode) && mode)
                mode = tweak_mode(mode, chmod_modes);
 
        if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
@@ -1340,7 +1340,7 @@ static struct file_struct *send_file_name(int f, struct file_list *flist,
        if (!file)
                return NULL;
 
-       if (chmod_modes && !S_ISLNK(file->mode))
+       if (chmod_modes && !S_ISLNK(file->mode) && file->mode)
                file->mode = tweak_mode(file->mode, chmod_modes);
 
        if (f >= 0) {