1 diff -Nur rsync-2.3.1/rsync.h rsync-2.3.1.pld/rsync.h
2 --- rsync-2.3.1/rsync.h Mon Mar 15 22:23:12 1999
3 +++ rsync-2.3.1.pld/rsync.h Thu Jun 17 09:27:07 1999
5 #define RSYNC_RSH_ENV "RSYNC_RSH"
7 #define RSYNC_NAME "rsync"
8 -#define RSYNCD_CONF "/etc/rsyncd.conf"
9 +#define RSYNCD_CONF "/etc/rsyncd/rsyncd.conf"
11 -#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
12 +#define DEFAULT_LOCK_FILE "/var/lock/rsyncd.lock"
13 #define URL_PREFIX "rsync://"
15 #define BACKUP_SUFFIX "~"
16 diff -Nur rsync-2.3.1/rsync.yo rsync-2.3.1.pld/rsync.yo
17 --- rsync-2.3.1/rsync.yo Tue Apr 6 17:04:17 1999
18 +++ rsync-2.3.1.pld/rsync.yo Thu Jun 17 09:33:26 1999
20 manpagesection(RUNNING AN RSYNC SERVER)
22 An rsync server is configured using a config file which by default is
23 -called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
24 +called /etc/rsyncd/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
27 manpagesection(EXAMPLES)
29 daemon. If standard input is a socket then rsync will assume that it
30 is being run via inetd, otherwise it will detach from the current
31 terminal and become a background daemon. The daemon will read the
32 -config file (/etc/rsyncd.conf) on each connect made by a client and
33 +config file (/etc/rsyncd/rsyncd.conf) on each connect made by a client and
34 respond to requests accordingly. See the rsyncd.conf(5) man page for more
37 dit(bf(--config=FILE)) This specifies an alternate config file than
38 -the default /etc/rsyncd.conf. This is only relevant when --daemon is
39 +the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is
42 dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
48 +/etc/rsyncd/rsyncd.conf
52 diff -Nur rsync-2.3.1/rsyncd.conf.5 rsync-2.3.1.pld/rsyncd.conf.5
53 --- rsync-2.3.1/rsyncd.conf.5 Tue Apr 6 17:04:17 1999
54 +++ rsync-2.3.1.pld/rsyncd.conf.5 Thu Jun 17 09:35:51 1999
56 and a single line something like this to /etc/inetd\&.conf:
59 -rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon
60 +rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon
63 You will then need to send inetd a HUP signal to tell it to reread its
66 Note that you should not send the rsync server a HUP signal to force
67 -it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
68 +it to reread the \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&. The file is re-read on each client
74 The "path" option specifies the directory in the servers
75 filesystem to make available in this module\&. You must specify this option
76 -for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
77 +for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&.
79 .IP "\fBuse chroot\fP"
80 If "use chroot" is true, the rsync server will chroot
82 you may find that passwords longer than 8 characters don\'t work\&.
84 There is no default for the "secrets file" option, you must choose a name
85 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&.
86 +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&.
88 .IP "\fBstrict modes\fP"
89 The "strict modes" option determines whether or not
92 syslog facility = local5
94 -pid file = /etc/rsyncd\&.pid
95 +pid file = /var/run/rsyncd\&.pid
101 comment = CVS repository (requires authentication)
102 auth users = tridge, susan
103 - secrets file = /etc/rsyncd\&.secrets
104 + secrets file = /etc/rsyncd/rsyncd\&.secrets
110 -The /etc/rsyncd\&.secrets file would look something like this:
111 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
120 +/etc/rsyncd/rsyncd\&.conf
124 diff -Nur rsync-2.3.1/rsyncd.conf.yo rsync-2.3.1.pld/rsyncd.conf.yo
125 --- rsync-2.3.1/rsyncd.conf.yo Tue Apr 6 17:04:17 1999
126 +++ rsync-2.3.1.pld/rsyncd.conf.yo Thu Jun 17 09:44:41 1999
129 and a single line something like this to /etc/inetd.conf:
131 -quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon)
132 +quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon)
134 You will then need to send inetd a HUP signal to tell it to reread its
137 Note that you should not send the rsync server a HUP signal to force
138 -it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client
139 +it to reread the tt(/etc/rsyncd/rsyncd.conf). The file is re-read on each client
142 manpagesection(GLOBAL OPTIONS)
145 dit(bf(path)) The "path" option specifies the directory in the servers
146 filesystem to make available in this module. You must specify this option
147 -for each module in tt(/etc/rsyncd.conf).
148 +for each module in tt(/etc/rsyncd/rsyncd.conf).
150 dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
151 to the "path" before starting the file transfer with the client. This has
153 you may find that passwords longer than 8 characters don't work.
155 There is no default for the "secrets file" option, you must choose a name
156 -(such as tt(/etc/rsyncd.secrets)).
157 +(such as tt(/etc/rsyncd/rsyncd.secrets)).
159 dit(bf(strict modes)) The "strict modes" option determines whether or not
160 the permissions on the secrets file will be checked. If "strict modes" is
163 max connections = 4 nl()
164 syslog facility = local5 nl()
165 -pid file = /etc/rsyncd.pid
166 +pid file = /var/run/rsyncd.pid
170 @@ -395,17 +395,17 @@
172 comment = CVS repository (requires authentication)
173 auth users = tridge, susan
174 - secrets file = /etc/rsyncd.secrets
175 + secrets file = /etc/rsyncd/rsyncd.secrets
178 -The /etc/rsyncd.secrets file would look something like this:
179 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
187 +/etc/rsyncd/rsyncd.conf
191 diff -Nur rsync-2.3.1/rsyncstats rsync-2.3.1.pld/rsyncstats
192 --- rsync-2.3.1/rsyncstats Wed Nov 25 17:24:40 1998
193 +++ rsync-2.3.1.pld/rsyncstats Thu Jun 17 09:29:14 1999
195 # ---------------------------------------------------------------------------
197 # edit the next line to customize for your default log file
198 -$usage_file = "/var/adm/rsyncd.log";
199 +$usage_file = "/var/log/rsyncd";
201 # Edit the following lines for default report settings.
202 # Entries defined here will be over-ridden by the command line.