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
updated --password-file docs
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
5f03226
..
8cf7bab
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-36,6
+36,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
char *p, *user=NULL;
extern int remote_version;
extern int am_sender;
char *p, *user=NULL;
extern int remote_version;
extern int am_sender;
+ extern struct in_addr socket_address;
if (*path == '/') {
rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
if (*path == '/') {
rprintf(FERROR,"ERROR: The remote path must start with a module name\n");
@@
-52,7
+53,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
if (!user) user = getenv("USER");
if (!user) user = getenv("LOGNAME");
- fd = open_socket_out(host, rsync_port);
+ fd = open_socket_out(host, rsync_port
, &socket_address
);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
@@
-100,7
+101,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
}
io_printf(fd,"\n");
}
io_printf(fd,"\n");
- if (remote_version >
17 && !am_sender
)
+ if (remote_version >
= 22 || (remote_version > 17 && !am_sender)
)
io_start_multiplex_in(fd);
return client_run(fd, fd, -1, argc, argv);
io_start_multiplex_in(fd);
return client_run(fd, fd, -1, argc, argv);
@@
-315,9
+316,17
@@
static int rsync_module(int fd, int i)
argp = argv + optind;
optind = 0;
argp = argv + optind;
optind = 0;
- if (remote_version >
17 && am_sender
)
+ if (remote_version >
= 22 || (remote_version > 17 && am_sender)
)
io_start_multiplex_out(fd);
io_start_multiplex_out(fd);
+ if (read_only) {
+ extern int am_sender;
+ if (!am_sender) {
+ rprintf(FERROR,"ERROR: module is read only\n");
+ return -1;
+ }
+ }
+
if (!ret) {
option_error();
}
if (!ret) {
option_error();
}
@@
-439,7
+448,6
@@
int daemon_main(void)
become_daemon();
if (!lp_load(config_file, 1)) {
become_daemon();
if (!lp_load(config_file, 1)) {
- fprintf(stderr,"failed to load config file %s\n", config_file);
exit_cleanup(RERR_SYNTAX);
}
exit_cleanup(RERR_SYNTAX);
}
@@
-455,7
+463,7
@@
int daemon_main(void)
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
if ((fd = do_open(lp_pid_file(), O_WRONLY|O_CREAT|O_TRUNC,
0666 & ~orig_umask)) == -1) {
cleanup_set_pid(0);
-
fprintf(stderr
,"failed to create pid file %s\n", pid_file);
+
rprintf(FLOG
,"failed to create pid file %s\n", pid_file);
exit_cleanup(RERR_FILEIO);
}
slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
exit_cleanup(RERR_FILEIO);
}
slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);