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
Print strerror when a system error occurs; add a new function rsyserr
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
5f03226
..
914d642
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-1,5
+1,6
@@
-/*
- Copyright (C) Andrew Tridgell 1998
+/* -*- c-file-style: "linux"; -*-
+
+ Copyright (C) 1998-2000 by Andrew Tridgell
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-36,6
+37,12
@@
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 (argc == 0 && !am_sender) {
+ extern int list_only;
+ list_only = 1;
+ }
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
+59,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,8
+107,10
@@
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)
- io_start_multiplex_in(fd);
+ if (remote_version < 23) {
+ if (remote_version == 22 || (remote_version > 17 && !am_sender))
+ io_start_multiplex_in(fd);
+ }
return client_run(fd, fd, -1, argc, argv);
}
return client_run(fd, fd, -1, argc, argv);
}
@@
-162,9
+171,6
@@
static int rsync_module(int fd, int i)
module_id = i;
module_id = i;
- if (lp_read_only(i))
- read_only = 1;
-
am_root = (getuid() == 0);
if (am_root) {
am_root = (getuid() == 0);
if (am_root) {
@@
-201,24
+207,24
@@
static int rsync_module(int fd, int i)
p = lp_exclude(i);
add_exclude_line(p);
p = lp_exclude(i);
add_exclude_line(p);
- log_
open
();
+ log_
init
();
if (use_chroot) {
if (chroot(lp_path(i))) {
if (use_chroot) {
if (chroot(lp_path(i))) {
- r
printf(FERROR,"chroot %s failed\n
", lp_path(i));
+ r
syserr(FERROR, errno, "chroot %s failed
", lp_path(i));
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/", 0)) {
io_printf(fd,"@ERROR: chroot failed\n");
return -1;
}
if (!push_dir("/", 0)) {
-
rprintf(FERROR,
"chdir %s failed\n", lp_path(i));
+
rsyserr(FERROR, errno,
"chdir %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
} else {
if (!push_dir(lp_path(i), 0)) {
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
} else {
if (!push_dir(lp_path(i), 0)) {
- r
printf(FERROR,
"chdir %s failed\n", lp_path(i));
+ r
syserr(FERROR, errno,
"chdir %s failed\n", lp_path(i));
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
io_printf(fd,"@ERROR: chdir failed\n");
return -1;
}
@@
-227,13
+233,13
@@
static int rsync_module(int fd, int i)
if (am_root) {
if (setgid(gid)) {
if (am_root) {
if (setgid(gid)) {
- r
printf(FERROR,"setgid %d failed\n
", gid);
+ r
syserr(FERROR, errno, "setgid %d failed
", gid);
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
if (setuid(uid)) {
io_printf(fd,"@ERROR: setgid failed\n");
return -1;
}
if (setuid(uid)) {
- r
printf(FERROR,"setuid %d failed\n
", uid);
+ r
syserr(FERROR, errno, "setuid %d failed
", uid);
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
io_printf(fd,"@ERROR: setuid failed\n");
return -1;
}
@@
-315,8
+321,10
@@
static int rsync_module(int fd, int i)
argp = argv + optind;
optind = 0;
argp = argv + optind;
optind = 0;
- if (remote_version > 17 && am_sender)
- io_start_multiplex_out(fd);
+ if (remote_version < 23) {
+ if (remote_version == 22 || (remote_version > 17 && am_sender))
+ io_start_multiplex_out(fd);
+ }
if (!ret) {
option_error();
if (!ret) {
option_error();
@@
-361,7
+369,7
@@
static int start_daemon(int fd)
set_socket_options(fd,"SO_KEEPALIVE");
set_socket_options(fd,lp_socket_options());
set_socket_options(fd,"SO_KEEPALIVE");
set_socket_options(fd,lp_socket_options());
-
+ set_nonblocking(fd);
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION);
@@
-439,11
+447,10
@@
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);
}
- log_
open
();
+ log_
init
();
rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
rprintf(FINFO,"rsyncd version %s starting\n",VERSION);
@@
-455,7
+462,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);
+
rsyserr(FLOG, errno, "failed to create pid file %s
", pid_file);
exit_cleanup(RERR_FILEIO);
}
slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);
exit_cleanup(RERR_FILEIO);
}
slprintf(pidbuf, sizeof(pidbuf), "%d\n", pid);