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
8485886
..
7389376
100644
(file)
--- a/
clientserver.c
+++ b/
clientserver.c
@@
-42,10
+42,11
@@
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;
extern char *shell_cmd;
extern int kludge_around_eof;
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;
list_only = 1;
if (argc == 0 && !am_sender) {
extern int list_only;
list_only = 1;
@@
-78,7
+79,8
@@
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_wrapped (host, rsync_port, &socket_address);
+ fd = open_socket_out_wrapped (host, rsync_port, bind_address,
+ default_af_hint);
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
if (fd == -1) {
exit_cleanup(RERR_SOCKETIO);
}
@@
-485,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;
@@
-500,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);
@@
-508,10
+512,12
@@
int daemon_main(void)
log_init();
log_init();
- rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n", VERSION,
+ rprintf(FINFO, "rsyncd version %s starting, listening on port %d\n",
+ RSYNC_VERSION,
rsync_port);
/* TODO: If listening on a particular address, then show that
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];