Fixed: #947765 - rsync daemon chooses wrong destination place

This commit is contained in:
Michal Luscon 2013-06-17 15:19:42 +02:00
parent f8860d7957
commit cc1ea5bd5a
2 changed files with 28 additions and 1 deletions

View File

@ -0,0 +1,22 @@
--- ./util.c 2011-04-23 00:51:55.000000000 +0200
+++ ./util.c 2013-06-14 15:10:21.381102268 +0200
@@ -25,6 +25,7 @@
extern int verbose;
extern int module_id;
+extern int protect_args;
extern int modify_window;
extern int relative_paths;
extern int preserve_times;
@@ -719,6 +720,11 @@
if (strncmp(arg, base, base_len) == 0)
arg += base_len;
+ if (protect_args) {
+ glob_expand(arg, argv_p, argc_p, maxargs_p);
+ return;
+ }
+
if (!(arg = strdup(arg)))
out_of_memory("glob_expand_module");

View File

@ -7,7 +7,7 @@
Summary: A program for synchronizing files over a network
Name: rsync
Version: 3.0.9
Release: 9%{?prerelease}%{?dist}
Release: 10%{?prerelease}%{?dist}
Group: Applications/Internet
URL: http://rsync.samba.org/
@ -26,6 +26,7 @@ License: GPLv3+
Patch0: rsync-3.0.10-lose-track.patch
Patch1: rsync-man.patch
Patch2: rsync-3.1.0-protect_args.patch
%description
Rsync uses a reliable algorithm to bring remote and host files into
@ -58,6 +59,7 @@ patch -p1 -i patches/copy-devices.diff
%patch0 -p1 -b .lose-track
%patch1 -p1 -b .man
%patch2 -p1 -b .protect_args
%build
rm -fr autom4te.cache
@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
%systemd_postun_with_restart rsyncd.service
%changelog
* Mon Jun 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-10
- Fixed: #947765 - rsync daemon chooses wrong destination place
* Fri May 17 2013 Michal Luscon <mluscon@redhat.com> - 3.0.9-9
- Fix missing man page and help options