The patches for 3.0.4pre2.

[rsync/rsync-patches.git] / munge-links.diff

diff --git a/munge-links.diff b/munge-links.diff
index 58a469b..cbbbfda 100644 (file)
--- a/munge-links.diff
+++ b/munge-links.diff
@@ -185,7 +185,7 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
 --- a/rsyncd.conf.yo
 +++ b/rsyncd.conf.yo
-@@ -192,8 +192,9 @@ to translate names, and that it is not possible for a user to change those
+@@ -191,8 +191,9 @@ to translate names, and that it is not possible for a user to change those
  resources.
  
  dit(bf(munge symlinks)) This parameter tells rsync to modify
@@ -197,13 +197,3 @@ diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
  your daemon module is writable.  The default is disabled when "use chroot"
  is on and the inside-chroot path is "/", otherwise it is enabled.
  
-@@ -213,7 +214,8 @@ to the exclude setting for the module so that
- a user can't try to create it.
- 
- Note:  rsync makes no attempt to verify that any pre-existing symlinks in
--the hierarchy are as safe as you want them to be.  If you setup an rsync
-+the module's hierarchy are as safe as you want them to be (unless, of
-+course, it just copied in the whole hierarchy).  If you setup an rsync
- daemon on a new area or locally add symlinks, you can manually protect your
- symlinks from being abused by prefixing "/rsyncd-munged/" to the start of
- every symlink's value.  There is a perl script in the support directory