Re: rsync server over SSH [includes code patches]

[Jeremy Hansen]

On Mon, 26 Nov 2001, Martin Pool wrote:

> On 25 Nov 2001, Jeremy Hansen <[EMAIL PROTECTED]> wrote:
> > 
> > Can someone tell me why this, and other patches on the list are failing 
> > for me.  I have a feeling I'm applying these diffs incorrectly for some 
> > reason.
> 
> What error do you get when you try to apply them?
> 
> You probably want something like
> 
>   patch -p0 < ~/rsync.diff

Actually, right now I'm just a rej on main.c

cali:/usr/src/redhat/SOURCES/rsync-2.4.6# patch -p0 < 
../rsync-ssh-over-daemon.patch 
patching file `authenticate.c'
patching file `clientserver.c'
patching file `main.c'
Hunk #2 FAILED at 166.
Hunk #8 FAILED at 763.
2 out of 8 hunks FAILED -- saving rejects to main.c.rej
patching file `options.c'
patching file `proto.h'
patching file `rsync.1'
patching file `socket.c'

cali:/usr/src/redhat/SOURCES/rsync-2.4.6# more main.c.rej 
***************
*** 165,172 ****
  
        args[argc++] = ".";
  
                if (path && *path)
                        args[argc++] = path;
  
        args[argc] = NULL;
  
--- 166,175 ----
  
        args[argc++] = ".";
  
+       if (!daemon_over_rsh) {
                if (path && *path)
                        args[argc++] = path;
+       }
  
        args[argc] = NULL;
  
***************
*** 734,740 ****
        if (am_server) {
                set_nonblocking(STDIN_FILENO);
                set_nonblocking(STDOUT_FILENO);
                        start_server(STDIN_FILENO, STDOUT_FILENO, argc, 
argv);
        }
  
        return start_client(argc, argv);
--- 763,773 ----
        if (am_server) {
                set_nonblocking(STDIN_FILENO);
                set_nonblocking(STDOUT_FILENO);
+               if (am_daemon) {
+                       return start_daemon(STDIN_FILENO, STDOUT_FILENO);
+               } else {
                        start_server(STDIN_FILENO, STDOUT_FILENO, argc, 
argv);
+               }
        }
  
        return start_client(argc, argv);

thanks
-jeremy


-- 
The trouble with being poor is that it takes up all your time.