Fixed failing hunks.

diff --git a/openssl-support.diff b/openssl-support.diff
index 300ba14..5ea6dc8 100644 (file)
--- a/openssl-support.diff
+++ b/openssl-support.diff
@@ -72,8 +72,8 @@ can't say if I've left any cleanup/compatibility errors in the code.
        if (verbose > 3) {
                rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n",
                        code, safe_fname(file), line);
---- orig/clientserver.c        2005-04-04 16:28:35
-+++ clientserver.c     2004-10-08 20:44:59
+--- orig/clientserver.c        2005-04-09 17:38:31
++++ clientserver.c     2005-04-09 17:39:57
 @@ -45,6 +45,9 @@ extern int select_timeout;
  extern int orig_umask;
  extern int no_detach;
@@ -88,7 +88,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
                exit_cleanup(RERR_SOCKETIO);
  
        ret = start_inband_exchange(user, path, fd, fd, argc);
-+      if (ret < 0)
++      if (ret)
 +              return ret;
 +
 +#if HAVE_OPENSSL
@@ -99,7 +99,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +      }
 +#endif
  
--      return ret < 0? ret : client_run(fd, fd, -1, argc, argv);
+-      return ret ? ret : client_run(fd, fd, -1, argc, argv);
 +      return client_run(fd, fd, -1, argc, argv);
  }
  
@@ -157,10 +157,10 @@ can't say if I've left any cleanup/compatibility errors in the code.
 +                      if (use_ssl)
 +                              end_tls();
 +#endif
-                       return RERR_STARTCLIENT;
-               } else {
-                       rprintf(FINFO,"%s\n", line);
-@@ -547,6 +595,7 @@ static void send_listing(int fd)
+                       return -1;
+               }
+ 
+@@ -545,6 +593,7 @@ static void send_listing(int fd)
                io_printf(fd,"@RSYNCD: EXIT\n");
  }
  
@@ -168,7 +168,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
  /* this is called when a connection is established to a client
     and we want to start talking. The setup of the system is done from
     here */
-@@ -596,6 +645,9 @@ int start_daemon(int f_in, int f_out)
+@@ -594,6 +643,9 @@ int start_daemon(int f_in, int f_out)
        if (protocol_version > remote_protocol)
                protocol_version = remote_protocol;
  
@@ -178,7 +178,7 @@ can't say if I've left any cleanup/compatibility errors in the code.
        line[0] = 0;
        if (!read_line(f_in, line, sizeof line - 1))
                return -1;
-@@ -605,6 +657,20 @@ int start_daemon(int f_in, int f_out)
+@@ -603,6 +655,20 @@ int start_daemon(int f_in, int f_out)
                return -1;
        }