-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 -urN rsync-2.6.8.org/rsyncd.conf.5 rsync-2.6.8/rsyncd.conf.5
+--- rsync-2.6.8.org/rsyncd.conf.5 2006-04-22 17:38:38.000000000 +0200
++++ rsync-2.6.8/rsyncd.conf.5 2006-04-22 18:45:54.300539750 +0200
+@@ -344,7 +344,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 @@
+@@ -656,13 +656,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
+@@ -673,7 +673,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
-@@ -69,7 +69,7 @@
+diff -urN rsync-2.6.8.org/rsyncd.conf.yo rsync-2.6.8/rsyncd.conf.yo
+--- rsync-2.6.8.org/rsyncd.conf.yo 2006-04-22 17:38:34.000000000 +0200
++++ rsync-2.6.8/rsyncd.conf.yo 2006-04-22 18:45:54.300539750 +0200
+@@ -66,7 +66,7 @@
reread its config file.
Note that you should bf(not) send the rsync daemon a HUP signal to force
connection.
manpagesection(GLOBAL OPTIONS)
-@@ -139,7 +139,7 @@
+@@ -137,7 +137,7 @@
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
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
-@@ -292,7 +292,7 @@
+@@ -309,7 +309,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
-@@ -543,10 +543,10 @@
+@@ -564,10 +564,10 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
quote(
tt(tridge:mypass)nl()
-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
+diff -urN rsync-2.6.8.org/rsync.h rsync-2.6.8/rsync.h
+--- rsync-2.6.8.org/rsync.h 2006-04-13 18:53:15.000000000 +0200
++++ rsync-2.6.8/rsync.h 2006-04-22 18:45:54.300539750 +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/support/rsyncstats 2004-05-02 10:20:23.170075432 +0200
-+++ rsync-2.6.2/support/rsyncstats 2004-05-02 11:13:25.761248032 +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.
-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
- 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 @@
+diff -urN rsync-2.6.8.org/rsync.yo rsync-2.6.8/rsync.yo
+--- rsync-2.6.8.org/rsync.yo 2006-04-22 17:38:34.000000000 +0200
++++ rsync-2.6.8/rsync.yo 2006-04-22 18:47:01.752755250 +0200
+@@ -1747,7 +1747,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
-(rsyncd.conf) on each connect made by a client and respond to
+(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
- requests accordingly. See the rsyncd.conf(5) man page for more
+ requests accordingly. See the bf(rsyncd.conf)(5) man page for more
details.
-@@ -1331,7 +1331,7 @@
+@@ -1765,7 +1765,7 @@
dit(bf(--config=FILE)) This specifies an alternate config file than
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
+ a remote shell program and the remote user is not the super-user; in that case
the default is rsyncd.conf in the current directory (typically $HOME).
-@@ -2005,7 +2005,7 @@
+@@ -2475,7 +2475,7 @@
manpagefiles()