-diff -Naur rsync-2.5.6-orig/rsync.h rsync-2.5.6/rsync.h
---- rsync-2.5.6-orig/rsync.h Sun Jan 26 21:11:16 2003
-+++ rsync-2.5.6/rsync.h Thu Jan 30 17:39:51 2003
-@@ -26,10 +26,10 @@
- #define RSYNC_RSH_ENV "RSYNC_RSH"
-
- #define RSYNC_NAME "rsync"
--#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
-+#define RSYNCD_SYSCONF "/etc/rsyncd/rsyncd.conf"
- #define RSYNCD_USERCONF "rsyncd.conf"
-
--#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
-+#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
- #define URL_PREFIX "rsync://"
-
- #define BACKUP_SUFFIX "~"
-diff -Naur rsync-2.5.6-orig/rsync.yo rsync-2.5.6/rsync.yo
---- rsync-2.5.6-orig/rsync.yo Tue Jan 28 04:11:57 2003
-+++ rsync-2.5.6/rsync.yo Thu Jan 30 17:42:31 2003
-@@ -214,7 +214,7 @@
-
- An rsync server is configured using a config 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).
-@@ -730,7 +730,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
- details.
-
-@@ -751,7 +751,7 @@
-
- dit(bf(--config=FILE)) This specifies an alternate config file than
- the default. This is only relevant when --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).
-
-@@ -1098,7 +1098,7 @@
-
- manpagefiles()
-
--/etc/rsyncd.conf or rsyncd.conf
-+/etc/rsyncd/rsyncd.conf or rsyncd.conf
-
- manpageseealso()
-
-diff -Naur rsync-2.5.6-orig/rsyncd.conf.5 rsync-2.5.6/rsyncd.conf.5
---- rsync-2.5.6-orig/rsyncd.conf.5 Mon Jan 27 04:07:18 2003
-+++ rsync-2.5.6/rsyncd.conf.5 Thu Jan 30 17:46:11 2003
-@@ -259,7 +259,7 @@
- you may find that passwords longer than 8 characters don\'t work\&.
+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 @@
+ 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
-(such as \f(CW/etc/rsyncd\&.secrets\fP)\&. The file must normally not be readable
by "other"; see "strict modes"\&.
.IP
.IP "\fBstrict modes\fP"
-@@ -504,13 +504,13 @@
+@@ -557,13 +557,13 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
.PP
tridge:mypass
.br
-@@ -518,7 +518,7 @@
+@@ -571,7 +571,7 @@
.PP
.SH "FILES"
.PP
.PP
.SH "SEE ALSO"
.PP
-diff -Naur rsync-2.5.6-orig/rsyncd.conf.yo rsync-2.5.6/rsyncd.conf.yo
---- rsync-2.5.6-orig/rsyncd.conf.yo Mon Jan 27 04:07:18 2003
-+++ rsync-2.5.6/rsyncd.conf.yo Thu Jan 30 17:48:52 2003
+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 @@
reread its config file.
dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
to the "path" before starting the file transfer with the client. This has
-@@ -239,7 +239,7 @@
+@@ -262,7 +262,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
-@@ -437,17 +437,17 @@
+@@ -486,17 +486,17 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
manpageseealso()
-diff -Naur rsync-2.5.6-orig/rsyncstats rsync-2.5.6/rsyncstats
---- rsync-2.5.6-orig/rsyncstats Mon Nov 23 01:30:27 1998
-+++ rsync-2.5.6/rsyncstats Thu Jan 30 17:50:17 2003
+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
+@@ -30,7 +30,7 @@
+ /* RSYNCD_SYSCONF is now set in config.h */
+ #define RSYNCD_USERCONF "rsyncd.conf"
+
+-#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
++#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
+ #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";
++$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 @@
+ 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
+ details.
+
+@@ -811,7 +811,7 @@
+
+ dit(bf(--config=FILE)) This specifies an alternate config file than
+ the default. This is only relevant when --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 @@
+
+ manpagefiles()
+
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
+
+ manpageseealso()
+