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
Autoindent
[rsync/rsync.git]
/
clientserver.c
diff --git
a/clientserver.c
b/clientserver.c
index
aefdb54
..
7389376
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-45,6
+45,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
extern char *shell_cmd;
extern int kludge_around_eof;
extern char *bind_address;
extern char *shell_cmd;
extern int kludge_around_eof;
extern char *bind_address;
+ extern int default_af_hint;
if (argc == 0 && !am_sender) {
extern int list_only;
if (argc == 0 && !am_sender) {
extern int list_only;
@@
-79,7
+80,7
@@
int start_socket_client(char *host, char *path, int argc, char *argv[])
if (!user) user = getenv("LOGNAME");
fd = open_socket_out_wrapped (host, rsync_port, bind_address,
if (!user) user = getenv("LOGNAME");
fd = open_socket_out_wrapped (host, rsync_port, bind_address,
-
global_opts.
af_hint);
+
default_
af_hint);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
@@
-486,6
+487,7
@@
int daemon_main(void)
extern char *config_file;
extern int orig_umask;
char *pid_file;
extern char *config_file;
extern int orig_umask;
char *pid_file;
+ extern int no_detach;
if (is_a_socket(STDIN_FILENO)) {
int i;
if (is_a_socket(STDIN_FILENO)) {
int i;
@@
-501,7
+503,8
@@
int daemon_main(void)
return start_daemon(STDIN_FILENO);
}
return start_daemon(STDIN_FILENO);
}
- become_daemon();
+ if (!no_detach)
+ become_daemon();
if (!lp_load(config_file, 1)) {
exit_cleanup(RERR_SYNTAX);
if (!lp_load(config_file, 1)) {
exit_cleanup(RERR_SYNTAX);
@@
-513,7
+516,8
@@
int daemon_main(void)
RSYNC_VERSION,
rsync_port);
/* TODO: If listening on a particular address, then show that
RSYNC_VERSION,
rsync_port);
/* TODO: If listening on a particular address, then show that
- * address too. */
+ * address too. In fact, why not just do inet_ntop on the
+ * local address??? */
if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
char pidbuf[16];
if (((pid_file = lp_pid_file()) != NULL) && (*pid_file != '\0')) {
char pidbuf[16];