1 diff -ur rsync-3.0.8.orig/rsync.h rsync-3.0.8/rsync.h
2 --- rsync-3.0.8.orig/rsync.h 2011-02-21 20:32:51.000000000 +0100
3 +++ rsync-3.0.8/rsync.h 2011-04-07 10:21:07.794002236 +0200
5 /* RSYNCD_SYSCONF is now set in config.h */
6 #define RSYNCD_USERCONF "rsyncd.conf"
8 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
9 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
10 #define URL_PREFIX "rsync://"
12 #define SYMLINK_PREFIX "/rsyncd-munged/" /* This MUST have a trailing slash! */
13 diff -ur rsync-3.0.8.orig/rsyncd.conf.5 rsync-3.0.8/rsyncd.conf.5
14 --- rsync-3.0.8.orig/rsyncd.conf.5 2011-03-26 22:37:52.000000000 +0100
15 +++ rsync-3.0.8/rsyncd.conf.5 2011-04-07 10:21:07.789502107 +0200
16 @@ -632,7 +632,7 @@ require that you specify a group passwor
19 There is no default for the "secrets file" parameter, you must choose a
20 -name (such as \fB/etc/rsyncd.secrets\fP). The file must normally not be
21 +name (such as \fB/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be
22 readable by "other"; see "strict modes". If the file is not found or is
23 rejected, no logins for a "user auth" module will be possible.
24 .IP "\fBstrict\ modes\fP"
25 @@ -1092,7 +1092,7 @@ that can be included into multiple modul
26 global values that will affect connections (such as \fBmotd\ file\fP), or globals
27 that will affect other include files.
29 -For example, this is a useful /etc/rsyncd.conf file:
30 +For example, this is a useful /etc/rsyncd/rsyncd.conf file:
34 @@ -1219,11 +1219,11 @@ pid file = /var/run/rsyncd.pid
36 comment = CVS repository (requires authentication)
37 auth users = tridge, susan
38 - secrets file = /etc/rsyncd.secrets
39 + secrets file = /etc/rsyncd/rsyncd.secrets
43 -The /etc/rsyncd.secrets file would look something like this:
44 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
48 @@ -1234,7 +1234,7 @@ susan:herpass
52 -/etc/rsyncd.conf or rsyncd.conf
53 +/etc/rsyncd/rsyncd.conf or rsyncd.conf