-diff -ruN rsync-2.3.2-new/rsync.h rsync-2.3.2/rsync.h
---- rsync-2.3.2-new/rsync.h Fri Nov 19 17:25:30 1999
-+++ rsync-2.3.2/rsync.h Mon Nov 8 14:15:02 1999
-@@ -24,9 +24,9 @@
- #define RSYNC_RSH_ENV "RSYNC_RSH"
-
- #define RSYNC_NAME "rsync"
--#define RSYNCD_CONF "/etc/rsyncd/rsyncd.conf"
-+#define RSYNCD_CONF "/etc/rsyncd.conf"
-
--#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
-+#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
- #define URL_PREFIX "rsync://"
-
- #define BACKUP_SUFFIX "~"
-diff -ruN rsync-2.3.2-new/rsync.yo rsync-2.3.2/rsync.yo
---- rsync-2.3.2-new/rsync.yo Fri Nov 19 17:26:52 1999
-+++ rsync-2.3.2/rsync.yo Mon Nov 8 14:15:02 1999
-@@ -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/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
-+called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
- information.
-
- manpagesection(EXAMPLES)
-@@ -591,7 +591,7 @@
- daemon. 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/rsyncd.conf) on each connect made by a client and
-+config file (/etc/rsyncd.conf) on each connect made by a client and
- respond to requests accordingly. See the rsyncd.conf(5) man page for more
- details.
-
-@@ -602,7 +602,7 @@
- --config option.
-
- dit(bf(--config=FILE)) This specifies an alternate config file than
--the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is
-+the default /etc/rsyncd.conf. This is only relevant when --daemon is
- specified.
-
- dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
-@@ -768,7 +768,7 @@
-
- manpagefiles()
-
--/etc/rsyncd/rsyncd.conf
-+/etc/rsyncd.conf
-
- manpageseealso()
-
-diff -ruN rsync-2.3.2-new/rsyncd.conf.5 rsync-2.3.2/rsyncd.conf.5
---- rsync-2.3.2-new/rsyncd.conf.5 Fri Nov 19 17:29:17 1999
-+++ rsync-2.3.2/rsyncd.conf.5 Mon Nov 8 14:15:02 1999
-@@ -59,7 +59,7 @@
- and a single line something like this to /etc/inetd\&.conf:
- .PP
- .RS
--rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon
-+rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon
- .RE
+diff -ruN rsync-2.3.2.orig/rsync.1 rsync-2.3.2/rsync.1
+--- rsync-2.3.2.orig/rsync.1 Mon Nov 8 14:15:01 1999
++++ rsync-2.3.2/rsync.1 Fri Nov 19 17:41:57 1999
+@@ -191,7 +191,7 @@
+ .SH "RUNNING AN RSYNC SERVER"
.PP
- Replace "/usr/bin/rsync" with the path to where you have rsync installed on
-@@ -67,7 +67,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/rsyncd\etc/rsyncd\&.conf.conf\fP\&. The file is re-read on each client
-+it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
- connection\&.
+ 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\&.
.PP
- .SH "GLOBAL OPTIONS"
-@@ -129,7 +129,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/rsyncd\&.conf\fP\&.
-+for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
+ .SH "EXAMPLES"
+@@ -682,7 +682,7 @@
+ daemon\&. 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
++config file (/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\&.
.IP
- .IP "\fBuse chroot\fP"
- If "use chroot" is true, the rsync server will chroot
-@@ -240,7 +240,7 @@
- you may find that passwords longer than 8 characters don\'t work\&.
+@@ -695,7 +695,7 @@
.IP
- There is no default for the "secrets file" option, you must choose a name
--(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&.
-+(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.
+ .IP "\fB--config=FILE\fP"
+ 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\&.
.IP
- .IP "\fBstrict modes\fP"
- The "strict modes" option determines whether or not
-@@ -439,7 +439,7 @@
- .br
- syslog facility = local5
- .br
--pid file = /var/run/rsyncd\&.pid
-+pid file = /etc/rsyncd\&.pid
- .PP
-
- .DS
-@@ -464,13 +464,13 @@
- path = /data/cvs
- comment = CVS repository (requires authentication)
- auth users = tridge, susan
-- secrets file = /etc/rsyncd/rsyncd\&.secrets
-+ secrets file = /etc/rsyncd\&.secrets
-
- .DE
-
-
- .PP
--The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
-+The /etc/rsyncd\&.secrets file would look something like this:
- .PP
- tridge:mypass
- .br
-@@ -478,7 +478,7 @@
+ .IP "\fB--port=PORT\fP"
+@@ -887,7 +887,7 @@
.PP
.SH "FILES"
.PP
--/etc/rsyncd/rsyncd\&.conf
-+/etc/rsyncd\&.conf
+-/etc/rsyncd\&.conf
++/etc/rsyncd/rsyncd\&.conf
.PP
.SH "SEE ALSO"
.PP
-diff -ruN rsync-2.3.2-new/rsyncd.conf.yo rsync-2.3.2/rsyncd.conf.yo
---- rsync-2.3.2-new/rsyncd.conf.yo Fri Nov 19 17:29:38 1999
-+++ rsync-2.3.2/rsyncd.conf.yo Mon Nov 8 14:15:02 1999
-@@ -56,14 +56,14 @@
-
- and a single line something like this to /etc/inetd.conf:
-
--quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon)
-+quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon)
-
- 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
- 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/rsyncd.conf). The file is re-read on each client
-+it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client
- connection.
-
- manpagesection(GLOBAL OPTIONS)
-@@ -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/rsyncd.conf).
-+for each module in tt(/etc/rsyncd.conf).
-
- 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
-@@ -220,7 +220,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
--(such as tt(/etc/rsyncd/rsyncd.secrets)).
-+(such as tt(/etc/rsyncd.secrets)).
-
- dit(bf(strict modes)) The "strict modes" option determines whether or not
- the permissions on the secrets file will be checked. If "strict modes" is
-@@ -382,7 +382,7 @@
- use chroot = no nl()
- max connections = 4 nl()
- syslog facility = local5 nl()
--pid file = /var/run/rsyncd.pid
-+pid file = /etc/rsyncd.pid
-
- verb([ftp]
- path = /var/ftp/pub
-@@ -404,17 +404,17 @@
- path = /data/cvs
- comment = CVS repository (requires authentication)
- auth users = tridge, susan
-- secrets file = /etc/rsyncd/rsyncd.secrets
-+ secrets file = /etc/rsyncd.secrets
- )
-
--The /etc/rsyncd/rsyncd.secrets file would look something like this:
-+The /etc/rsyncd.secrets file would look something like this:
-
- tridge:mypass nl()
- susan:herpass
-
- manpagefiles()
-
--/etc/rsyncd/rsyncd.conf
-+/etc/rsyncd.conf
-
- manpageseealso()
-
-diff -ruN rsync-2.3.2-new/rsyncstats rsync-2.3.2/rsyncstats
---- rsync-2.3.2-new/rsyncstats Fri Nov 19 17:25:30 1999
-+++ rsync-2.3.2/rsyncstats Wed Nov 25 17:24:40 1998
-@@ -23,7 +23,7 @@
- # ---------------------------------------------------------------------------
-
- # edit the next line to customize for your default log file
--$usage_file = "/var/log/rsyncd";
-+$usage_file = "/var/adm/rsyncd.log";
-
- # Edit the following lines for default report settings.
- # Entries defined here will be over-ridden by the command line.
+diff -ruN rsync-2.3.2.orig/rsyncd.conf.5 rsync-2.3.2/rsyncd.conf.5
+--- rsync-2.3.2.orig/rsyncd.conf.5 Mon Nov 8 14:15:02 1999
++++ rsync-2.3.2/rsyncd.conf.5 Fri Nov 19 17:36:27 1999
+@@ -150,7 +150,7 @@
+ The "lock file" option specifies the file to use to
+ support the "max connections" option\&. The rsync server uses record
+ locking on this file to ensure that the max connections limit is not
+-exceeded\&. The default is \f(CW/var/run/rsyncd\&.lock\fP\&.
++exceeded\&. The default is \f(CW/var/lock/rsyncd\&.lock\fP\&.
+ .IP
+ .IP "\fBread only\fP"
+ The "read only" option determines whether clients
projects / packages / rsync.git / blobdiff