diff options
| author | Wayne Davison <wayned@samba.org> | 2010-10-12 08:05:43 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2010-10-12 10:34:38 -0700 |
| commit | 5ebe9a46d7f3c846a6d665cb8c6ab8b79508a6df (patch) | |
| tree | 3465ebb93bce22b899e0add70865506718724a9b /clientserver.c | |
| parent | d64bda1c1e79dc385f194d74f7957ce7cd118654 (diff) | |
| download | android_external_rsync-5ebe9a46d7f3c846a6d665cb8c6ab8b79508a6df.tar.gz android_external_rsync-5ebe9a46d7f3c846a6d665cb8c6ab8b79508a6df.tar.bz2 android_external_rsync-5ebe9a46d7f3c846a6d665cb8c6ab8b79508a6df.zip | |
Add @group auth and overrides to "auth user" daemon config.
Diffstat (limited to 'clientserver.c')
| -rw-r--r-- | clientserver.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/clientserver.c b/clientserver.c index 469371f9..afd2b179 100644 --- a/clientserver.c +++ b/clientserver.c @@ -164,7 +164,7 @@ static int exchange_protocols(int f_in, int f_out, char *buf, size_t bufsiz, int } /* This strips the \n. */ - if (!read_line_old(f_in, buf, bufsiz)) { + if (!read_line_old(f_in, buf, bufsiz, 0)) { if (am_client) rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; @@ -283,7 +283,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char kluge_around_eof = list_only && protocol_version < 25 ? 1 : 0; while (1) { - if (!read_line_old(f_in, line, sizeof line)) { + if (!read_line_old(f_in, line, sizeof line, 0)) { rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } @@ -544,6 +544,7 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char return -1; } + read_only = lp_read_only(i); /* may also be overridden by auth_server() */ auth_user = auth_server(f_in, f_out, i, host, addr, "@RSYNCD: AUTHREQD "); if (!auth_user) { @@ -554,9 +555,6 @@ static int rsync_module(int f_in, int f_out, int i, const char *addr, const char module_id = i; - if (lp_read_only(i)) - read_only = 1; - if (lp_transfer_logging(i) && !logfile_format) logfile_format = lp_log_format(i); if (log_format_has(logfile_format, 'i')) @@ -1034,7 +1032,7 @@ int start_daemon(int f_in, int f_out) return -1; line[0] = 0; - if (!read_line_old(f_in, line, sizeof line)) + if (!read_line_old(f_in, line, sizeof line, 0)) return -1; if (!*line || strcmp(line, "#list") == 0) { |