Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added check to ensure that a read-only daemon doesn't honor
[rsync/rsync-patches.git]
/
backup-dir-dels.diff
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
02f92e6
..
0c17fec
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-14,7
+14,7
@@
suffix.
Marc St-Onge
Marc St-Onge
---- orig/backup.c 2005-01-
19 20:11:10
+--- orig/backup.c 2005-01-
25 12:14:14
+++ backup.c 2004-09-22 02:36:06
@@ -22,11 +22,17 @@
+++ backup.c 2004-09-22 02:36:06
@@ -22,11 +22,17 @@
@@
-83,7
+83,7
@@
Marc St-Onge
char *p = end;
@@ -168,7 +194,8 @@ static int keep_backup(char *fname)
char *p = end;
@@ -168,7 +194,8 @@ static int keep_backup(char *fname)
- if (!(file = make_file(fname, NULL, NO_
EXCLUDE
S)))
+ if (!(file = make_file(fname, NULL, NO_
FILTER
S)))
return 1; /* the file could have disappeared */
- if (!(buf = get_backup_name(fname)))
return 1; /* the file could have disappeared */
- if (!(buf = get_backup_name(fname)))
@@
-106,7
+106,7
@@
Marc St-Onge
+ deleting = 0;
+ return ret;
+}
+ deleting = 0;
+ return ret;
+}
---- orig/flist.c 2005-01-25
00:53:58
+--- orig/flist.c 2005-01-25
12:14:14
+++ flist.c 2005-01-24 02:21:33
@@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN];
extern unsigned int curr_dir_len;
+++ flist.c 2005-01-24 02:21:33
@@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN];
extern unsigned int curr_dir_len;
@@
-125,7
+125,7
@@
Marc St-Onge
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
-@@ -16
61,10 +1664
,14 @@ char *f_name(struct file_struct *f)
+@@ -16
59,10 +1662
,14 @@ char *f_name(struct file_struct *f)
return f_name_to(f, names[n]);
}
return f_name_to(f, names[n]);
}
@@
-141,7
+141,7
@@
Marc St-Onge
}
void delete_in_dir(struct file_list *flist, char *fname)
}
void delete_in_dir(struct file_list *flist, char *fname)
-@@ -171
8,11 +1725
,12 @@ void delete_in_dir(struct file_list *fli
+@@ -171
6,11 +1723
,12 @@ void delete_in_dir(struct file_list *fli
|| (delete_during && S_ISDIR(mode)
&& !S_ISDIR(flist->files[j]->mode))) {
char *f = f_name(del_flist->files[i]);
|| (delete_during && S_ISDIR(mode)
&& !S_ISDIR(flist->files[j]->mode))) {
char *f = f_name(del_flist->files[i]);
@@
-157,7
+157,7
@@
Marc St-Onge
safe_fname(f));
}
} else {
safe_fname(f));
}
} else {
---- orig/options.c 2005-01-25
03:26:51
+--- orig/options.c 2005-01-25
12:14:14
+++ options.c 2004-11-27 18:37:18
@@ -119,10 +119,14 @@ int no_detach = 0;
int write_batch = 0;
+++ options.c 2004-11-27 18:37:18
@@ -119,10 +119,14 @@ int no_detach = 0;
int write_batch = 0;
@@
-220,7
+220,7
@@
Marc St-Onge
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
@@ -944,6 +956,12 @@ int parse_arguments(int *argc, const cha
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
@@ -944,6 +956,12 @@ int parse_arguments(int *argc, const cha
- if (check_
exclude
(elp, backup_dir, 1) < 0)
+ if (check_
filter
(elp, backup_dir, 1) < 0)
goto options_rejected;
}
+ /* Clean delete_dir same as for backup_dir */
goto options_rejected;
}
+ /* Clean delete_dir same as for backup_dir */
@@
-230,7
+230,7
@@
Marc St-Onge
+ goto options_rejected;
+ }
}
+ goto options_rejected;
+ }
}
- if (server_
exclude
_list.head && files_from) {
+ if (server_
filter
_list.head && files_from) {
clean_fname(files_from, 1);
@@ -964,6 +982,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
clean_fname(files_from, 1);
@@ -964,6 +982,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);