1 diff -ruN rsync-2.3.2/rsync.h rsync-2.3.2-new/rsync.h
2 --- rsync-2.3.2/rsync.h Mon Nov 8 14:15:02 1999
3 +++ rsync-2.3.2-new/rsync.h Fri Nov 19 17:51:35 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 --- rsync-2.5.3/rsync.yo.orig Fri Jan 25 11:42:23 2002
17 +++ rsync-2.5.3/rsync.yo Sat Jan 26 07:10:18 2002
19 manpagesection(RUNNING AN RSYNC SERVER)
21 An rsync server is configured using a config file which by default is
22 -called /etc/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
23 +called /etc/rsyncd/rsyncd.conf. Please see the rsyncd.conf(5) man page for more
26 manpagesection(EXAMPLES)
28 If standard input is a socket then rsync will assume that it is being
29 run via inetd, otherwise it will detach from the current terminal and
30 become a background daemon. The daemon will read the config file
31 -(/etc/rsyncd.conf) on each connect made by a client and respond to
32 +(/etc/rsyncd/rsyncd.conf) on each connect made by a client and respond to
33 requests accordingly. See the rsyncd.conf(5) man page for more
37 in conjunction with the --config option.
39 dit(bf(--config=FILE)) This specifies an alternate config file than
40 -the default /etc/rsyncd.conf. This is only relevant when --daemon is
41 +the default /etc/rsyncd/rsyncd.conf. This is only relevant when --daemon is
44 dit(bf(--port=PORT)) This specifies an alternate TCP port number to use
50 +/etc/rsyncd/rsyncd.conf
54 --- rsync-2.5.3/rsyncd.conf.5.orig Fri Aug 31 10:12:35 2001
55 +++ rsync-2.5.3/rsyncd.conf.5 Sat Jan 26 07:13:23 2002
57 and a single line something like this to /etc/inetd\&.conf:
60 -rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon
61 +rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon
64 Replace "/usr/bin/rsync" with the path to where you have rsync installed on
66 reread its config file\&.
68 Note that you should not send the rsync server a HUP signal to force
69 -it to reread the \f(CW/etc/rsyncd\&.conf\fP\&. The file is re-read on each client
70 +it to reread the \f(CW/etc/rsyncd/rsyncd\etc/rsyncd\&.conf.conf\fP\&. The file is re-read on each client
76 The "path" option specifies the directory in the servers
77 filesystem to make available in this module\&. You must specify this option
78 -for each module in \f(CW/etc/rsyncd\&.conf\fP\&.
79 +for each module in \f(CW/etc/rsyncd/rsyncd\&.conf\fP\&.
81 .IP "\fBuse chroot\fP"
82 If "use chroot" is true, the rsync server will chroot
84 you may find that passwords longer than 8 characters don\'t work\&.
86 There is no default for the "secrets file" option, you must choose a name
87 -(such as \f(CW/etc/rsyncd\&.secrets\fP)\&. The file must normally not be readable
88 +(such as \f(CW/etc/rsyncd/rsyncd\&.secrets\fP)\&. The file must normally not be readable
89 by "other"; see "strict modes"\&.
91 .IP "\fBstrict modes\fP"
94 comment = CVS repository (requires authentication)
95 auth users = tridge, susan
96 - secrets file = /etc/rsyncd\&.secrets
97 + secrets file = /etc/rsyncd/rsyncd\&.secrets
103 -The /etc/rsyncd\&.secrets file would look something like this:
104 +The /etc/rsyncd/rsyncd\&.secrets file would look something like this:
113 +/etc/rsyncd/rsyncd\&.conf
117 --- rsync-2.5.3/rsyncd.conf.yo.orig Fri Aug 31 10:12:35 2001
118 +++ rsync-2.5.3/rsyncd.conf.yo Sat Jan 26 07:14:48 2002
121 and a single line something like this to /etc/inetd.conf:
123 -quote(rsync stream tcp nowait root /usr/bin/rsync rsyncd --daemon)
124 +quote(rsync stream tcp nowait root /usr/sbin/rsync rsyncd --daemon)
126 Replace "/usr/bin/rsync" with the path to where you have rsync installed on
127 your system. You will then need to send inetd a HUP signal to tell it to
128 reread its config file.
130 Note that you should not send the rsync server a HUP signal to force
131 -it to reread the tt(/etc/rsyncd.conf). The file is re-read on each client
132 +it to reread the tt(/etc/rsyncd/rsyncd.conf). The file is re-read on each client
135 manpagesection(GLOBAL OPTIONS)
138 dit(bf(path)) The "path" option specifies the directory in the servers
139 filesystem to make available in this module. You must specify this option
140 -for each module in tt(/etc/rsyncd.conf).
141 +for each module in tt(/etc/rsyncd/rsyncd.conf).
143 dit(bf(use chroot)) If "use chroot" is true, the rsync server will chroot
144 to the "path" before starting the file transfer with the client. This has
146 you may find that passwords longer than 8 characters don't work.
148 There is no default for the "secrets file" option, you must choose a name
149 -(such as tt(/etc/rsyncd.secrets)). The file must normally not be readable
150 +(such as tt(/etc/rsyncd/rsyncd.secrets)). The file must normally not be readable
151 by "other"; see "strict modes".
153 dit(bf(strict modes)) The "strict modes" option determines whether or not
154 @@ -420,17 +420,17 @@
156 comment = CVS repository (requires authentication)
157 auth users = tridge, susan
158 - secrets file = /etc/rsyncd.secrets
159 + secrets file = /etc/rsyncd/rsyncd.secrets
162 -The /etc/rsyncd.secrets file would look something like this:
163 +The /etc/rsyncd/rsyncd.secrets file would look something like this:
171 +/etc/rsyncd/rsyncd.conf
175 diff -ruN rsync-2.3.2/rsyncstats rsync-2.3.2-new/rsyncstats
176 --- rsync-2.3.2/rsyncstats Wed Nov 25 17:24:40 1998
177 +++ rsync-2.3.2-new/rsyncstats Fri Nov 19 17:51:35 1999
179 # ---------------------------------------------------------------------------
181 # edit the next line to customize for your default log file
182 -$usage_file = "/var/adm/rsyncd.log";
183 +$usage_file = "/var/log/rsyncd";
185 # Edit the following lines for default report settings.
186 # Entries defined here will be over-ridden by the command line.