diff options
author | Wayne Davison <wayned@samba.org> | 2005-07-28 19:19:47 +0000 |
---|---|---|
committer | Wayne Davison <wayned@samba.org> | 2005-07-28 19:19:47 +0000 |
commit | 29050a25657761e920f42f266a3009c91bd4407b (patch) | |
tree | ebec1062e2348d808eeb89f3ed8f28161eb3aa70 | |
parent | 04a13dd4083e45f53a7150db9f66852cb73bcdb9 (diff) | |
download | rsync-29050a25657761e920f42f266a3009c91bd4407b.tar.gz |
Incorporate the improvements made to the daemon/remote-shell sections.
-rw-r--r-- | rsync.yo | 9 | ||||
-rw-r--r-- | rsyncd.conf.yo | 29 |
2 files changed, 0 insertions, 38 deletions
@@ -307,7 +307,6 @@ to the detailed description below for a complete description. verb( --suffix=SUFFIX backup suffix (default ~ w/o --backup-dir) -u, --update skip files that are newer on the receiver --inplace update destination files in-place - --append append data onto shorter files -d, --dirs transfer directories without recursing -l, --links copy symlinks as symlinks -L, --copy-links transform symlink into referent file/dir @@ -567,14 +566,6 @@ should not use this option to update files that are in use. Also note that rsync will be unable to update a file in-place that is not writable by the receiving user. -dit(bf(--append)) This causes rsync to update a file by appending data onto -the end of the file, which presumes that the data that already exists on -the receiving side is identical with the start of the file on the sending -side. If that is not true, the file will fail the checksum test, and the -resend will do a normal bf(--inplace) update to correct the mismatch. Any -file on the receiving side that is longer than a file on the sending side -is skipped. Implies bf(--inplace). - dit(bf(-d, --dirs)) Tell the sending side to include any directories that are encountered. Unlike bf(--recursive), a directory's contents are not copied unless the directory was specified on the command-line as either "." or a diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo index 665dcd3a..f4d6d2d6 100644 --- a/rsyncd.conf.yo +++ b/rsyncd.conf.yo @@ -454,35 +454,6 @@ of the patterns will not be compressed during transfer. The default setting is tt(*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz) -dit(bf(pre-xfer exec), bf(post-xfer exec)) You may specify a command to be run -before and/or after the transfer. If the bf(pre-xfer exec) command fails, the -transfer is aborted before it begins. - -The following environment variables are set for both commands: - -quote(itemize( - it() bf(RSYNC_MODULE_NAME): The name of the module being accessed. - it() bf(RSYNC_MODULE_PATH): The path configured for the module. - it() bf(RSYNC_HOST_ADDR): The accessing host's IP address. - it() bf(RSYNC_HOST_NAME): The accessing host's name. - it() bf(RSYNC_USER_NAME): The accessing user's name (empty if no user). -)) - -These environment variables will also be set for the bf(post-xfer exec) -command: - -quote(itemize( - it() bf(RSYNC_EXIT_STATUS): rsync's exit value. This will be 0 for a - successful run, a positive value for an error that rsync returned - (e.g. 23=partial xfer), or a -1 if rsync failed to exit properly. - it() bf(RSYNC_RAW_STATUS): the raw exit value from waitpid(). -)) - -Even though the commands can be associated with a particular module, they -are run using the permissions of the user that started the daemon (not the -module's uid/gid setting) without any chroot restrictions (even if the -module will/has run chroot()ed). - enddit() manpagesection(AUTHENTICATION STRENGTH) |