Some platforms may have getaddrinfo() but not sockaddr_storage.

[rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 0f543610fd7a4d0aa6f6c64578493680b91a8f09..1b3801bc3b1e2b5079f58b7e015c92cc027cdd06 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -42,10 +42,10 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        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 *bind_address;
+       
        if (argc == 0 && !am_sender) {
                extern int list_only;
                list_only = 1;
@@ -78,7 +78,8 @@ int start_socket_client(char *host, char *path, int argc, char *argv[])
        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,
+                                     global_opts.af_hint);
        if (fd == -1) {
                exit_cleanup(RERR_SOCKETIO);
        }
@@ -244,10 +245,18 @@ static int rsync_module(int fd, int i)
        log_init();
 
        if (use_chroot) {
-               /* TODO: If we're not running as root, then we'll get
-                * an error here.  I wonder if we should perhaps just
-                * log a warning here, and continue anyhow using the
-                * push_dir feature? -- mbp 2001-08-31 */
+               /*
+                * XXX: The 'use chroot' flag is a fairly reliable
+                * source of confusion, because it fails under two
+                * important circumstances: running as non-root,
+                * running on Win32 (or possibly others).  On the
+                * other hand, if you are running as root, then it
+                * might be better to always use chroot.
+                *
+                * So, perhaps if we can't chroot we should just issue
+                * a warning, unless a "require chroot" flag is set,
+                * in which case we fail.
+                */
                if (chroot(lp_path(i))) {
                        rsyserr(FERROR, errno, "chroot %s failed", lp_path(i));
                        io_printf(fd,"@ERROR: chroot failed\n");
@@ -492,7 +501,8 @@ int daemon_main(void)
                return start_daemon(STDIN_FILENO);
        }
 
-       become_daemon();
+       if (!global_opts.no_detach)
+           become_daemon();
 
        if (!lp_load(config_file, 1)) {
                exit_cleanup(RERR_SYNTAX);
@@ -500,10 +510,12 @@ int daemon_main(void)
 
        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
-         * 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];