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
fixed the relative paths bug pointed out by Alberto Accomazzi
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
0723560
..
3266da5
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-118,6
+118,7
@@
static int rsync_module(int fd, int i)
char *name = lp_name(i);
char *user;
int start_glob=0;
char *name = lp_name(i);
char *user;
int start_glob=0;
+ int ret;
char *request=NULL;
extern int am_sender;
extern int remote_version;
char *request=NULL;
extern int am_sender;
extern int remote_version;
@@
-251,7
+252,7
@@
static int rsync_module(int fd, int i)
}
}
}
}
- parse_arguments(argc, argv);
+
ret =
parse_arguments(argc, argv);
if (request) {
if (*user) {
if (request) {
if (*user) {
@@
-266,8
+267,10
@@
static int rsync_module(int fd, int i)
free(request);
}
free(request);
}
+#if !TRIDGE
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
/* don't allow the logs to be flooded too fast */
if (verbose > 1) verbose = 1;
+#endif
argc -= optind;
argp = argv + optind;
argc -= optind;
argp = argv + optind;
@@
-276,6
+279,11
@@
static int rsync_module(int fd, int i)
if (remote_version > 17 && am_sender)
io_start_multiplex_out(fd);
if (remote_version > 17 && am_sender)
io_start_multiplex_out(fd);
+ if (!ret) {
+ rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+ exit_cleanup(1);
+ }
+
start_server(fd, fd, argc, argp);
return 0;
start_server(fd, fd, argc, argp);
return 0;
@@
-375,7
+383,15
@@
int daemon_main(void)
push_dir("/", 0);
if (is_a_socket(STDIN_FILENO)) {
push_dir("/", 0);
if (is_a_socket(STDIN_FILENO)) {
- /* we are running via inetd */
+ int i;
+
+ /* we are running via inetd - close off stdout and
+ stderr so that library functions (and getopt) don't
+ try to use them. Redirect them to /dev/null */
+ for (i=1;i<3;i++) {
+ close(i);
+ open("/dev/null", O_RDWR);
+ }
return start_daemon(STDIN_FILENO);
}
return start_daemon(STDIN_FILENO);
}