Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
If the module has defined an "incoming chmod" option, call
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
978135d
..
20d5253
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-45,10
+45,12
@@
extern int orig_umask;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern
struct filter_list_struct server_filter_list
;
+extern
char *sockopts
;
extern char *config_file;
extern char *files_from;
extern char *tmpdir;
extern char *config_file;
extern char *files_from;
extern char *tmpdir;
+extern struct chmod_mode_struct *chmod_modes;
+extern struct filter_list_struct server_filter_list;
char *auth_user;
int read_only = 0;
char *auth_user;
int read_only = 0;
@@
-98,6
+100,8
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
+ set_socket_options(fd, sockopts);
+
ret = start_inband_exchange(user, path, fd, fd, argc);
return ret ? ret : client_run(fd, fd, -1, argc, argv);
ret = start_inband_exchange(user, path, fd, fd, argc);
return ret ? ret : client_run(fd, fd, -1, argc, argv);
@@
-679,6
+683,11
@@
static int rsync_module(int f_in, int f_out, int i)
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
if (lp_timeout(i) && lp_timeout(i) > io_timeout)
set_io_timeout(lp_timeout(i));
+
+ p = lp_incoming_chmod(i);
+ if (*p && !parse_chmod(p, &chmod_modes))
+ rprintf(FLOG, "Invalid \"incoming chmod\" directive: %s\n", p);
+
start_server(f_in, f_out, argc, argv);
return 0;
start_server(f_in, f_out, argc, argv);
return 0;
@@
-718,7
+727,10
@@
int start_daemon(int f_in, int f_out)
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
if (!am_server) {
set_socket_options(f_in, "SO_KEEPALIVE");
- set_socket_options(f_in, lp_socket_options());
+ if (sockopts)
+ set_socket_options(f_in, sockopts);
+ else
+ set_socket_options(f_in, lp_socket_options());
set_nonblocking(f_in);
}
set_nonblocking(f_in);
}