diff -uprk.orig rsync-2.6.4.orig/loadparm.c rsync-2.6.4/loadparm.c --- rsync-2.6.4.orig/loadparm.c 2005-02-19 20:38:51 +0300 +++ rsync-2.6.4/loadparm.c 2005-03-31 19:56:48 +0400 @@ -160,7 +160,7 @@ static service sDefault = True, /* use chroot */ False, /* transfer logging */ False, /* ignore errors */ - "nobody",/* uid */ + "rsyncd",/* uid */ /* TODO: This causes problems on Debian, where it is called * "nogroup". Debian patch this in their version of the @@ -169,7 +169,7 @@ static service sDefault = * * What is the best behaviour? Perhaps always using (gid_t) * -2? */ - "nobody",/* gid */ + "rsyncd",/* gid */ NULL, /* hosts allow */ NULL, /* hosts deny */ @@ -184,9 +184,9 @@ static service sDefault = "%o %h [%a] %m (%u) %f %l", /* log format */ NULL, /* refuse options */ "*.gz *.tgz *.zip *.z *.rpm *.deb *.iso *.bz2 *.tbz", /* dont compress */ - 0, /* timeout */ + 60, /* timeout */ 0, /* max connections */ - False /* ignore nonreadable */ + True /* ignore nonreadable */ }; @@ -316,9 +316,13 @@ Initialise the global parameter structur static void init_globals(void) { memset(&Globals, 0, sizeof Globals); +#ifdef LOG_FTP + Globals.syslog_facility = LOG_FTP; +#else #ifdef LOG_DAEMON Globals.syslog_facility = LOG_DAEMON; #endif +#endif Globals.max_verbosity = 1; } diff -uprk.orig rsync-2.6.4.orig/rsyncd.conf.5 rsync-2.6.4/rsyncd.conf.5 --- rsync-2.6.4.orig/rsyncd.conf.5 2005-03-31 07:14:12 +0400 +++ rsync-2.6.4/rsyncd.conf.5 2005-03-31 19:56:48 +0400 @@ -116,7 +116,7 @@ rsync server\&. You may use any standard defined on your system\&. Common names are auth, authpriv, cron, daemon, ftp, kern, lpr, mail, news, security, syslog, user, uucp, local0, local1, local2, local3, local4, local5, local6 and local7\&. The default -is daemon\&. +is ftp\&. .IP .IP "\fBsocket options\fP" This option can provide endless fun for people @@ -235,14 +235,14 @@ for modules to be listable\&. The "uid" option specifies the user name or user ID that file transfers to and from that module should take place as when the daemon was run as root\&. In combination with the "gid" option this determines what -file permissions are available\&. The default is uid -2, which is normally -the user "nobody"\&. +file permissions are available\&. +The default is user "rsyncd"\&. .IP .IP "\fBgid\fP" The "gid" option specifies the group name or group ID that file transfers to and from that module should take place as when the daemon -was run as root\&. This complements the "uid" option\&. The default is gid -2, -which is normally the group "nobody"\&. +was run as root\&. This complements the "uid" option\&. +The default is group "rsyncd"\&. .IP .IP "\fBfilter\fP" The "filter" option allows you to specify a space-separated @@ -408,6 +408,7 @@ This tells the rsync server to completel ignore files that are not readable by the user\&. This is useful for public archives that may have some non-readable files among the directories, and the sysadmin doesn\&'t want those files to be seen at all\&. +This options is enabled by default\&. .IP .IP "\fBtransfer logging\fP" The "transfer logging" option enables per-file @@ -483,6 +484,7 @@ can ensure that rsync won\&'t wait on a is specified in seconds\&. A value of zero means no timeout and is the default\&. A good choice for anonymous rsync servers may be 600 (giving a 10 minute timeout)\&. +Default value is 60 (one minute)\&. .IP .IP "\fBrefuse options\fP" The "refuse options" option allows you to