applied simple nohang patch from Wayne Davison
authorAndrew Tridgell <tridge@samba.org>
Tue, 26 Jun 2001 01:20:42 +0000 (01:20 +0000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 26 Jun 2001 01:20:42 +0000 (01:20 +0000)
main.c

diff --git a/main.c b/main.c
index 63fab0d..38df5a0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -504,16 +504,16 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
                        rprintf(FINFO,"file list sent\n");
 
                send_files(flist,f_out,f_in);
+               if (remote_version >= 24) {
+                       /* final goodbye message */             
+                       read_int(f_in);
+               }
                if (pid != -1) {
                        if (verbose > 3)
                                rprintf(FINFO,"client_run waiting on %d\n",pid);
                        io_flush();
                        wait_process(pid, &status);
                }
-               if (remote_version >= 24) {
-                       /* final goodbye message */             
-                       read_int(f_in);
-               }
                report(-1);
                exit_cleanup(status);
        }