X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7c583c73160714a2f61034515adb1a4a32f9d818..13e29995f5f08300ea946374079dff50f8cb6bd7:/clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 1b3801bc..73893764 100644
--- 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 int default_af_hint;
        
 	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,
-				      global_opts.af_hint);
+				      default_af_hint);
 	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 int no_detach;
 
 	if (is_a_socket(STDIN_FILENO)) {
 		int i;
@@ -501,7 +503,7 @@ int daemon_main(void)
 		return start_daemon(STDIN_FILENO);
 	}
 
-	if (!global_opts.no_detach)
+	if (!no_detach)
 	    become_daemon();
 
 	if (!lp_load(config_file, 1)) {