diff options
author | Wayne Davison <wayned@samba.org> | 2006-10-12 03:01:18 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2006-10-12 03:01:18 +0000 |
commit | 1a7f3d99c5d4bcb5f38e2143bfb99fdf571fab69 (patch) | |
tree | 0e4b92d9e082ac6d48fe383e4a9179ab2ea4dc7e /options.c | |
parent | e80876700c49d5465df9e4b7c3e2f985eb137b8d (diff) | |
download | rsync-1a7f3d99c5d4bcb5f38e2143bfb99fdf571fab69.tar.gz |
Removed the changes in symlink handling in non-chroot daemon mode as
they were not yet safe (I'll consider similar changes for the next
release).
Diffstat (limited to 'options.c')
-rw-r--r-- | options.c | 12 |
1 files changed, 3 insertions, 9 deletions
@@ -902,10 +902,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case OPT_EXCLUDE_FROM: case OPT_INCLUDE_FROM: arg = poptGetOptArg(pc); - if (sanitize_paths) { + if (sanitize_paths) arg = sanitize_path(NULL, arg, NULL, 0, NULL); - die_on_unsafe_path((char*)arg, 0); - } if (server_filter_list.head) { char *cp = strdup(arg); if (!cp) @@ -1223,14 +1221,10 @@ int parse_arguments(int *argc, const char ***argv, int frommain) int i; for (i = *argc; i-- > 0; ) (*argv)[i] = sanitize_path(NULL, (*argv)[i], "", 0, NULL); - if (tmpdir) { + if (tmpdir) tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL); - die_on_unsafe_path(tmpdir, 0); - } - if (backup_dir) { + if (backup_dir) backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL); - die_on_unsafe_path(backup_dir, 0); - } } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; |