-diff -burN rsync-2.6.2.orig/rsyncd.conf.5 rsync-2.6.2/rsyncd.conf.5
---- rsync-2.6.2.orig/rsyncd.conf.5 2004-05-02 10:20:23.157077408 +0200
-+++ rsync-2.6.2/rsyncd.conf.5 2004-05-02 11:11:53.624254984 +0200
-@@ -282,7 +282,7 @@
+diff -urBb rsync-2.6.5.org/rsyncd.conf.5 rsync-2.6.5/rsyncd.conf.5
+--- rsync-2.6.5.org/rsyncd.conf.5 2005-07-23 16:01:33.135106000 +0200
++++ rsync-2.6.5/rsyncd.conf.5 2005-07-23 16:01:58.800205112 +0200
+@@ -325,7 +325,7 @@
you may find that passwords longer than 8 characters don\&'t work\&.
.IP
There is no default for the "secrets file" option, you must choose a name
by "other"; see "strict modes"\&.
.IP
.IP "\fBstrict modes\fP"
-@@ -557,13 +557,13 @@
+@@ -623,13 +623,13 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
-The /etc/rsyncd\&.secrets file would look something like this:
+The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
.PP
- tridge:mypass
- .br
-@@ -571,7 +571,7 @@
+ .RS
+ \f(CWtridge:mypass\fP
+@@ -640,7 +640,7 @@
.PP
.SH "FILES"
.PP
.PP
.SH "SEE ALSO"
.PP
-diff -burN rsync-2.6.2.orig/rsyncd.conf.yo rsync-2.6.2/rsyncd.conf.yo
---- rsync-2.6.2.orig/rsyncd.conf.yo 2004-05-02 10:20:23.170075432 +0200
-+++ rsync-2.6.2/rsyncd.conf.yo 2004-05-02 11:13:07.881966096 +0200
+diff -urBb rsync-2.6.5.org/rsyncd.conf.yo rsync-2.6.5/rsyncd.conf.yo
+--- rsync-2.6.5.org/rsyncd.conf.yo 2005-07-23 16:01:33.136106000 +0200
++++ rsync-2.6.5/rsyncd.conf.yo 2005-07-23 16:01:58.800205112 +0200
@@ -69,7 +69,7 @@
reread its config file.
- Note that you should not send the rsync server a HUP signal to force
+ Note that you should bf(not) send the rsync daemon a HUP signal to force
-it to reread the tt(rsyncd.conf) file. The file is re-read on each client
+it to reread the tt(/etc/rsyncd/rsyncd.conf) file. The file is re-read on each client
connection.
manpagesection(GLOBAL OPTIONS)
-@@ -128,7 +128,7 @@
+@@ -139,7 +139,7 @@
- dit(bf(path)) The "path" option specifies the directory in the servers
+ dit(bf(path)) The "path" option specifies the directory in the daemon's
filesystem to make available in this module. You must specify this option
-for each module in tt(rsyncd.conf).
+for each module in tt(/etc/rsyncd/rsyncd.conf).
- dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
+ dit(bf(use chroot)) If "use chroot" is true, the rsync daemon will chroot
to the "path" before starting the file transfer with the client. This has
-@@ -262,7 +262,7 @@
+@@ -292,7 +292,7 @@
you may find that passwords longer than 8 characters don't work.
There is no default for the "secrets file" option, you must choose a name
by "other"; see "strict modes".
dit(bf(strict modes)) The "strict modes" option determines whether or not
-@@ -486,17 +486,17 @@
+@@ -543,10 +543,10 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
-The /etc/rsyncd.secrets file would look something like this:
+The /etc/rsyncd/rsyncd.secrets file would look something like this:
- tridge:mypass nl()
- susan:herpass
-
- manpagefiles()
-
--/etc/rsyncd.conf or rsyncd.conf
-+/etc/rsyncd/rsyncd.conf or rsyncd.conf
-
- manpageseealso()
-
-diff -burN rsync-2.6.2.orig/rsync.h rsync-2.6.2/rsync.h
---- rsync-2.6.2.orig/rsync.h 2004-05-02 10:20:23.165076192 +0200
-+++ rsync-2.6.2/rsync.h 2004-05-02 10:29:51.993601112 +0200
+ quote(
+ tt(tridge:mypass)nl()
+diff -urBb rsync-2.6.5.org/rsync.h rsync-2.6.5/rsync.h
+--- rsync-2.6.5.org/rsync.h 2005-05-03 19:00:47.000000000 +0200
++++ rsync-2.6.5/rsync.h 2005-07-23 16:01:58.801204960 +0200
@@ -30,7 +30,7 @@
/* RSYNCD_SYSCONF is now set in config.h */
#define RSYNCD_USERCONF "rsyncd.conf"
#define URL_PREFIX "rsync://"
#define BACKUP_SUFFIX "~"
-diff -burN rsync-2.6.2.orig/rsyncstats rsync-2.6.2/rsyncstats
---- rsync-2.6.2.orig/rsyncstats 2004-05-02 10:20:23.170075432 +0200
-+++ rsync-2.6.2/rsyncstats 2004-05-02 11:13:25.761248032 +0200
-@@ -23,7 +23,7 @@
- # ---------------------------------------------------------------------------
-
- # edit the next line to customize for your default log file
--$usage_file = "/var/adm/rsyncd.log";
-+$usage_file = "/var/log/rsyncd.log";
+diff -urBb rsync-2.6.5.org/rsync.yo rsync-2.6.5/rsync.yo
+--- rsync-2.6.5.org/rsync.yo 2005-07-23 16:01:33.135106000 +0200
++++ rsync-2.6.5/rsync.yo 2005-07-23 16:02:35.743588864 +0200
+@@ -233,7 +233,7 @@
- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.
-diff -burN rsync-2.6.2.orig/rsync.yo rsync-2.6.2/rsync.yo
---- rsync-2.6.2.orig/rsync.yo 2004-05-02 10:20:23.163076496 +0200
-+++ rsync-2.6.2/rsync.yo 2004-05-02 11:10:50.675824600 +0200
-@@ -219,7 +219,7 @@
-
- An rsync server is configured using a configuration file. Please see the
+ An rsync daemon is configured using a configuration file. Please see the
rsyncd.conf(5) man page for more information. By default the configuration
--file is called /etc/rsyncd.conf, unless rsync is running over a remote
-+file is called /etc/rsyncd/rsyncd.conf, unless rsync is running over a remote
- shell program and is not running as root; in that case, the default name
- is rsyncd.conf in the current directory on the remote computer
- (typically $HOME).
-@@ -790,7 +790,7 @@
+-file is called /etc/rsyncd.conf (unless the daemon is spawned via a remote
++file is called /etc/rsyncd/rsyncd.conf (unless the daemon is spawned via a remote
+ shell--see below).
+
+ manpagesection(RUNNING AN RSYNC DAEMON OVER A REMOTE SHELL PROGRAM)
+@@ -1334,7 +1334,7 @@
If standard input is a socket then rsync will assume that it is being
run via inetd, otherwise it will detach from the current terminal and
become a background daemon. The daemon will read the config file
requests accordingly. See the rsyncd.conf(5) man page for more
details.
-@@ -811,7 +811,7 @@
+@@ -1352,7 +1352,7 @@
dit(bf(--config=FILE)) This specifies an alternate config file than
- the default. This is only relevant when --daemon is specified.
+ the default. This is only relevant when bf(--daemon) is specified.
-The default is /etc/rsyncd.conf unless the daemon is running over
+The default is /etc/rsyncd/rsyncd.conf unless the daemon is running over
a remote shell program and the remote user is not root; in that case
the default is rsyncd.conf in the current directory (typically $HOME).
-@@ -1258,7 +1258,7 @@
+@@ -2045,7 +2045,7 @@
manpagefiles()
manpageseealso()
+diff -urBb rsync-2.6.5.org/support/rsyncstats rsync-2.6.5/support/rsyncstats
+--- rsync-2.6.5.org/support/rsyncstats 2005-02-19 20:36:54.000000000 +0100
++++ rsync-2.6.5/support/rsyncstats 2005-07-23 16:01:58.801204960 +0200
+@@ -12,7 +12,7 @@
+ use Getopt::Long;
+
+ # You may wish to edit the next line to customize for your default log file.
+-$usage_file = "/var/adm/rsyncd.log";
++$usage_file = "/var/log/rsyncd.log";
+
+ # Edit the following lines for default report settings.
+ # Entries defined here will be over-ridden by the command line.
projects / packages / rsync.git / blobdiff