search for: find_colon

...h) { /* rsync:// always uses rsync server over direct socket connection */ if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { char *host, *path; *************** *** 732,739 **** return start_socket_client(host, path, argc-1, argv+1); } ! if (!read_batch) { ! p = find_colon(argv[0]); if (p) { if (p[1] == ':') { /* double colon */ --- 736,742 ---- return start_socket_client(host, path, argc-1, argv+1); } ! p = find_colon(argv[0]); if (p) { if (p[1] == ':') { /* double colon */ *************** *** 808,816 **** } arg...

This is a patch made by the redhat folks. I noticed it in their src.rpm for rsync while I was updating it for 2.5.7. I figure at the worst, it's a nice bit of protection. It would be cool to get this put into CVS. -- Kees Cook kees@kernel.org -------------- next part -------------- --- rsync-2.4.6/main.c.foo Fri Aug 17 11:46:03 2001 +++ rsync-2.4.6/main.c Fri Aug 17 11:45:37 2001 @@

...le: /cvsroot/rsync/main.c,v retrieving revision 1.197 diff -c -b -d -r1.197 main.c *** a/main.c 11 Jun 2004 07:40:54 -0000 1.197 --- b/main.c 17 Jun 2004 04:01:56 -0000 *************** *** 735,743 **** return start_socket_client(host, path, argc-1, argv+1); } ! if (!read_batch) { p = find_colon(argv[0]); ! if (p) { if (remote_filesfrom_file && remote_filesfrom_file != files_from + 1 && strncmp(files_from, argv[0], p-argv[0]+1) != 0) { --- 735,743 ---- return start_socket_client(host, path, argc-1, argv+1); } ! if (!read_batch) { /* for read_ba...

...URL_PREFIX); + p = strchr(host,'/'); + if (p) { + *p = 0; + path = p+1; + } else { + path=""; + } + p = strchr(host,':'); + if (p) { + rsync_port = atoi(p+1); + *p = 0; + } + return start_socket_client(host, path, argc-1, argv); + } + p = find_colon(argv[argc-1]); if (!p) { + /* Local copy. */ local_server = 1; } else if (p[1] == ':') { + /* Last paramter is HOST::MODULE. + * Send to remote rsyncd server. */ *p = 0; return start_socket_client(argv[argc-1], p+2, argc-1, argv); } @@ -726,6 +756,8 @@ exit_c...

...****** *** 555,560 **** --- 558,564 ---- extern int am_sender; extern char *shell_cmd; extern int rsync_port; + extern int run_inband; if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) { char *host, *path; *************** *** 578,584 **** p = find_colon(argv[0]); if (p) { ! if (p[1] == ':') { *p = 0; return start_socket_client(argv[0], p+2, argc-1, argv+1); } --- 582,591 ---- p = find_colon(argv[0]); if (p) { ! if ((p[1] == ':') && (p[2] == ':')) { ! *p++ = 0;...

> Just curious: what about the rsync+ patch? Thanks for the reminder. I've just committed Jos's rsync+ patch onto the "branch_mbp_rsyncplus_merge" branch. If it works OK and nobody screams I will move it across onto the main tree tomorrow or Wednesday. I see the patch doesn't add documentation about the new options to the man page, so we should fix that in the future.

...58,6 +658,7 @@ extern char *shell_cmd; extern int rsync_port; extern int whole_file; + extern int write_batch; extern int read_batch; int rc; @@ -685,7 +686,7 @@ return start_socket_client(host, path, argc-1, argv+1); } - if (!read_batch) { /* dw */ + if (!read_batch) { p = find_colon(argv[0]); if (p) { @@ -711,8 +712,11 @@ p = find_colon(argv[argc-1]); if (!p) { local_server = 1; - /* disable "rsync algorithm" when both sides local */ - if (whole_file == -1) + /* + * disable "rsync algorithm" when both sides local, + * except when c...