-diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
---- rsync-2.3.2/rsync.h Mon Nov 8 14:15:02 1999
-+++ rsync-2.3.2-new/rsync.h Fri Nov 19 17:51:35 1999
-@@ -24,9 +24,9 @@
- #define RSYNC_RSH_ENV "RSYNC_RSH"
-
- #define RSYNC_NAME "rsync"
--#define RSYNCD_CONF "/etc/rsyncd.conf"
-+#define RSYNCD_CONF "/etc/rsyncd/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 "~"
---- rsync-2.5.3/rsync.yo.orig Fri Jan 25 11:42:23 2002
-+++ rsync-2.5.3/rsync.yo Sat Jan 26 07:10:18 2002
-@@ -173,7 +173,7 @@
- manpagesection(RUNNING AN RSYNC SERVER)
-
- An rsync server is configured using a config file which by default is
--called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
-+called /etc/rsyncd/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
- information.
-
- manpagesection(EXAMPLES)
-@@ -628,7 +628,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
--(/etc/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.
-
-@@ -648,7 +648,7 @@
- in conjunction with the --config option.
-
- dit(bf(--config=FILE)) This specifies an alternate config file than
--the default /etc/rsyncd.conf. This is only relevant when --daemon is
-+the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is
- specified.
-
- dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
-@@ -926,7 +926,7 @@
-
- manpagefiles()
-
--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
-
- manpageseealso()
+diff -ur rsync-3.0.0pre6.org/rsync.1 rsync-3.0.0pre6/rsync.1
+--- rsync-3.0.0pre6.org/rsync.1 2007-11-28 10:00:29.000000000 +0100
++++ rsync-3.0.0pre6/rsync.1 2007-12-10 22:18:49.896441464 +0100
+@@ -2398,7 +2398,7 @@
+ .IP "\fB\-\-config=FILE\fP"
+ This specifies an alternate config file than
+ the default. This is only relevant when \fB\-\-daemon\fP 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 the super-user; in that case
+ the default is rsyncd.conf in the current directory (typically $HOME).
+ .IP
+@@ -3302,7 +3302,7 @@
+ .SH "FILES"
---- rsync-2.5.3/rsyncd.conf.5.orig Fri Aug 31 10:12:35 2001
-+++ rsync-2.5.3/rsyncd.conf.5 Sat Jan 26 07:13:23 2002
-@@ -64,7 +64,7 @@
- and a single line something like this to /etc/inetd\&.conf:
- .PP
- .RS
--rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon
-+rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon
- .RE
- .PP
- Replace "/usr/bin/rsync" with the path to where you have rsync installed on
-@@ -72,7 +72,7 @@
- reread its config file\&.
.PP
- Note that you should not send the rsync server a HUP signal to force
--it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
-+it to reread the \f(CW/etc/rsyncd/rsyncd\etc/rsyncd\&.conf.conf\fP\&. The file is re-read on each client
- connection\&.
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
.PP
- .SH "GLOBAL OPTIONS"
-@@ -134,7 +134,7 @@
- .IP "\fBpath\fP"
- The "path" option specifies the directory in the servers
- filesystem to make available in this module\&. You must specify this option
--for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
-+for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&.
+ .SH "SEE ALSO"
+
+diff -ur rsync-3.0.0pre6.org/rsyncd.conf.5 rsync-3.0.0pre6/rsyncd.conf.5
+--- rsync-3.0.0pre6.org/rsyncd.conf.5 2007-11-28 10:00:29.000000000 +0100
++++ rsync-3.0.0pre6/rsyncd.conf.5 2007-12-10 22:19:26.808284001 +0100
+@@ -268,7 +268,7 @@
+ support the \(lqmax connections\(rq option. The rsync daemon uses record
+ locking on this file to ensure that the max connections limit is not
+ exceeded for the modules sharing the lock file.
+-The default is \f(CW/var/run/rsyncd.lock\fP.
++The default is \f(CW/var/lock/rsyncd.lock\fP.
.IP
- .IP "\fBuse chroot\fP"
- If "use chroot" is true, the rsync server will chroot
-@@ -250,7 +250,7 @@
- you may find that passwords longer than 8 characters don\'t work\&.
+ .IP "\fBread only\fP"
+ The \(lqread only\(rq option determines whether clients
+@@ -408,7 +408,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
-+(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&. The file must normally not be readable
- by "other"; see "strict modes"\&.
+ There is no default for the \(lqsecrets file\(rq parameter, you must choose a name
+-(such as \f(CW/etc/rsyncd.secrets\fP). The file must normally not be readable
++(such as \f(CW/etc/rsyncd/rsyncd.secrets\fP). The file must normally not be readable
+ by \(lqother\(rq; see \(lqstrict modes\(rq.
.IP
- .IP "\fBstrict modes\fP"
-@@ -481,13 +481,13 @@
+ .IP "\fBstrict modes\fP"
+@@ -733,12 +733,12 @@
path = /data/cvs
comment = CVS repository (requires authentication)
auth users = tridge, susan
-- secrets file = /etc/rsyncd\&.secrets
-+ secrets file = /etc/rsyncd/rsyncd\&.secrets
+- secrets file = /etc/rsyncd.secrets
++ secrets file = /etc/rsyncd/rsyncd.secrets
.fi
-
.PP
--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
-@@ -495,7 +495,7 @@
- .PP
- .SH "FILES"
+-The /etc/rsyncd.secrets file would look something like this:
++The /etc/rsyncd/rsyncd.secrets file would look something like this:
.PP
--/etc/rsyncd\&.conf
-+/etc/rsyncd/rsyncd\&.conf
+ .RS
+ \f(CWtridge:mypass\fP
+@@ -751,7 +751,7 @@
+ .SH "FILES"
+
.PP
- .SH "SEE ALSO"
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
.PP
---- rsync-2.5.3/rsyncd.conf.yo.orig Fri Aug 31 10:12:35 2001
-+++ rsync-2.5.3/rsyncd.conf.yo Sat Jan 26 07:14:48 2002
-@@ -61,14 +61,14 @@
-
- and a single line something like this to /etc/inetd.conf:
-
--quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon)
-+quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon)
+ .SH "SEE ALSO"
- Replace "/usr/bin/rsync" with the path to where you have rsync installed on
- your system. You will then need to send inetd a HUP signal to tell it to
+diff -ur rsync-3.0.0pre6.org/rsyncd.conf.yo rsync-3.0.0pre6/rsyncd.conf.yo
+--- rsync-3.0.0pre6.org/rsyncd.conf.yo 2007-11-28 10:00:37.000000000 +0100
++++ rsync-3.0.0pre6/rsyncd.conf.yo 2007-12-10 22:15:49.037413489 +0100
+@@ -66,7 +66,7 @@
reread its config file.
- Note that you should not send the rsync server a HUP signal to force
--it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client
-+it to reread the tt(/etc/rsyncd/rsyncd.conf). The file is re-read on each client
- connection.
+ 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)
-@@ -127,7 +127,7 @@
+@@ -122,7 +122,7 @@
- dit(bf(path)) The "path" option specifies the directory in the servers
- filesystem to make available in this module. You must specify this option
--for each module in tt(/etc/rsyncd.conf).
+ dit(bf(path)) The "path" parameter specifies the directory in the daemon's
+ filesystem to make available in this module. You must specify this parameter
+-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
-@@ -230,7 +230,7 @@
- you may find that passwords longer than 8 characters don't work.
+@@ -360,7 +360,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
+ There is no default for the "secrets file" parameter, you must choose a name
-(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable
+(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
by "other"; see "strict modes".
- dit(bf(strict modes)) The "strict modes" option determines whether or not
-@@ -420,17 +420,17 @@
+ dit(bf(strict modes)) The "strict modes" parameter determines whether or not
+@@ -624,10 +624,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
+ quote(
+ tt(tridge:mypass)nl()
+diff -ur rsync-3.0.0pre6.org/rsync.h rsync-3.0.0pre6/rsync.h
+--- rsync-3.0.0pre6.org/rsync.h 2007-11-27 16:34:59.000000000 +0100
++++ rsync-3.0.0pre6/rsync.h 2007-12-10 22:15:49.064081486 +0100
+@@ -29,7 +29,7 @@
+ /* RSYNCD_SYSCONF is now set in config.h */
+ #define RSYNCD_USERCONF "rsyncd.conf"
- manpagefiles()
+-#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
++#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
+ #define URL_PREFIX "rsync://"
--/etc/rsyncd.conf
-+/etc/rsyncd/rsyncd.conf
+ #define SYMLINK_PREFIX "/rsyncd-munged/"
+diff -ur rsync-3.0.0pre6.org/rsync.yo rsync-3.0.0pre6/rsync.yo
+--- rsync-3.0.0pre6.org/rsync.yo 2007-11-28 10:00:37.000000000 +0100
++++ rsync-3.0.0pre6/rsync.yo 2007-12-10 22:15:49.067414986 +0100
+@@ -2062,7 +2062,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 bf(rsyncd.conf)(5) man page for more
+ details.
- manpageseealso()
+@@ -2080,7 +2080,7 @@
-diff -ruN rsync-2.3.2/rsyncstats rsync-2.3.2-new/rsyncstats
---- rsync-2.3.2/rsyncstats Wed Nov 25 17:24:40 1998
-+++ rsync-2.3.2-new/rsyncstats Fri Nov 19 17:51:35 1999
-@@ -23,7 +23,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 the super-user; in that case
+ the default is rsyncd.conf in the current directory (typically $HOME).
+
+@@ -2810,7 +2810,7 @@
+
+ manpagefiles()
+
+-/etc/rsyncd.conf or rsyncd.conf
++/etc/rsyncd/rsyncd.conf or rsyncd.conf
- # edit the next line to customize for your default log file
--$usage_file = "/var/adm/rsyncd.log";
-+$usage_file = "/var/log/rsyncd";
+ manpageseealso()
- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.
projects / packages / rsync.git / blobdiff