search for: am_send

...* *** 97,109 **** return ret < 0? ret : client_run(fd, fd, -1, argc, argv); } ! int start_inband_exchange(char *user, char *path, int f_in, int f_out, int argc) { int i; char *sargs[MAX_ARGS]; int sargc = 0; char line[MAXPATHLEN]; char *p; if (argc == 0 && !am_sender) list_only = 1; --- 99,121 ---- return ret < 0? ret : client_run(fd, fd, -1, argc, argv); } ! /* start_inband_exchange() contains an unfortunate write_batch ! * hack/workaround. The issue here is that the protocol for version ! * exchange differs when an rsyncd server is involve...

...2. The filters added in setup_protocol in compat.c don't seem to be taking effect on local rsyncs. See this run of CVS rsync to which I added some debugging output: [matt@mattlaptop backup]$ ~/rsync/rsync/rsync -in -vv -a --backup --del src/ dest/ Parsed rule Pp *~ <-- setup_protocol am_sender is 1, filter_list.head is 8878ac8 sending incremental file list testing is_excluded . testing is_excluded dir am_sender is 1, filter_list.head is 0 <-- I assume the sender elided the protect rule. testing is_excluded dir/foo am_sender is 1, filter_list.head is 0 delta-transmission disabled f...

...am_i; + /* there's probably never more than at most 2 outstanding child processes, * but set it higher just in case. @@ -198,7 +200,7 @@ static void show_malloc_stats(void) getpid(), am_server ? "server " : "", am_daemon ? "daemon " : "", - am_sender ? "sender" : "receiver"); + who_am_i); rprintf(FINFO, " arena: %10d (bytes from sbrk)\n", mi.arena); rprintf(FINFO, " ordblks: %10d (chunks not in use)\n", mi.ordblks); rprintf(FINFO, " smblks: %10d\n", mi.smblks); @@ -455,6...

> 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.

...---- daemon_over_rsh = 1; } ! if (argc < 1) { /* destination required */ usage(FERROR); exit_cleanup(RERR_SYNTAX); } *************** *** 764,772 **** *p = 0; shell_machine = argv[0]; shell_path = p+1; - argc--; argv++; ! } else { am_sender = 1; /* rsync:// destination uses rsync server over direct socket */ --- 764,771 ---- *p = 0; shell_machine = argv[0]; shell_path = p+1; argv++; ! } else { /* source is local */ am_sender = 1; /* rsync:// destination uses rsync server over direct socket...

....5.2.orig/main.c rsync-2.5.2/main.c --- rsync-2.5.2.orig/main.c Fri Jan 25 11:07:41 2002 +++ rsync-2.5.2/main.c Sat Feb 23 13:49:38 2002 @@ -306,10 +306,19 @@ extern int relative_paths; extern int recurse; extern int remote_version; + extern int am_daemon; + extern int module_id; + extern int am_sender; if (verbose > 2) rprintf(FINFO,"server_sender starting pid=%d\n",(int)getpid()); + if (am_daemon && lp_write_only(module_id) && am_sender) { + rprintf(FERROR,"ERROR: module is write only\n"); + exit_cleanup(RERR_SYNTAX); + return; + } + if (!rel...

...lientserver.c 2001/11/19 20:31:47 1.4 *************** *** 29,48 **** int start_socket_client(char *host, char *path, int argc, char *argv[]) { ! int fd, i; ! char *sargs[MAX_ARGS]; ! int sargc=0; ! char line[MAXPATHLEN]; char *p, *user=NULL; - extern int remote_version; - extern int am_sender; extern struct in_addr socket_address; - - if (argc == 0 && !am_sender) { - extern int list_only; - list_only = 1; - } if (*path == '/') { rprintf(FERROR,"ERROR: The remote path must start with a module name\n"); return -1; --- 29,42 ---- int...

...art -------------- diff -r --unified rsync-2.5.4pre1-orig/flist.c rsync-2.5.4pre1/flist.c --- rsync-2.5.4pre1-orig/flist.c Thu Feb 14 05:30:27 2002 +++ rsync-2.5.4pre1/flist.c Tue Mar 12 21:57:27 2002 @@ -36,7 +36,9 @@ extern int verbose; extern int do_progress; extern int am_server; +extern int am_sender; extern int always_checksum; +extern int drop_suid; extern int cvs_exclude; @@ -714,6 +716,10 @@ #ifdef HAVE_STRUCT_STAT_ST_RDEV file->rdev = st.st_rdev; #endif + + if (am_sender && drop_suid && S_ISREG(st.st_mode)) { + file->mode &= ~(S_ISUID | S_ISGID); + }...

...OR, "ERROR: %s\n", "too many --compare-dest args given"); + return 0; + } + compare_dest[num_comp_dest] = (char *)poptGetOptArg(pc); + num_comp_dest++; link_dest = 1; break; #else @@ -925,13 +948,16 @@ args[ac++] = tmpdir; } - if (compare_dest && am_sender) { + if (compare_dest[0] && am_sender) { /* the server only needs this option if it is not the sender, * and it may be an older version that doesn't know this * option, so don't send it if client is the sender. */ - args[ac++] = link_dest ? "--link-dest&qu...

...+ /* First parameter is HOST::MODULE. + * Receive from remote rsyncd server. */ *p = 0; return start_socket_client(argv[0], p+2, argc-1, argv+1); } @@ -704,6 +708,8 @@ exit_cleanup(RERR_SYNTAX); } + /* First parameter is HOST:MODULE. + * Receive from remote shell. */ am_sender = 0; *p = 0; shell_machine = argv[0]; @@ -713,10 +719,34 @@ } else { am_sender = 1; + if (strncasecmp(URL_PREFIX, argv[argc-1], strlen(URL_PREFIX)) == 0) { + char *host, *path; + /* Last parameter is rsync://HOST/MODULE. + * Send to remote rsyncd server. */ + + host = argv[...

...oid remember_initial_stats(void) { initial_data_read = total_data_read; initial_data_written = total_data_written; } In function 'log_formatted' the following code is used: case 'b': if (!(iflags & ITEM_TRANSFER)) b = 0; else if (am_sender) b = total_data_written - initial_data_written; else b = total_data_read - initial_data_read; strlcat(fmt, "s", sizeof fmt); snprintf(buf2, sizeof buf2, fmt, do_big_num(b, humanize, NULL));...

...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 **** } argc--; } ! } else { am_sender = 1; ! local_server = 1; shell_path = argv[argc-1]; } --- 811,857 ---- } argc--; } ! } else { /* read_batch */ am_sender = 1; ! ! if (argc > 1) { ! usage(FERROR); ! exit_cleanup(RERR_SYNTAX); ! } ! ! if (strncasecmp(URL_PREFIX, argv[0], strlen...

...de <sys/capability.h> +#endif +#endif + #include "rsync.h" extern int module_id; @@ -217,6 +229,10 @@ int start_glob=0; int ret; char *request=NULL; +#ifdef HAVE_LINUX_CAPS + cap_t cp; + cap_value_t newcaps[2] = { CAP_SYS_CHROOT, CAP_DAC_READ_SEARCH }; +#endif extern int am_sender; extern int am_server; extern int am_daemon; @@ -373,12 +389,46 @@ } #endif +#ifdef HAVE_LINUX_CAPS + if (setreuid(uid, 0)) { + rsyserr(FERROR, errno, "setreuid(%d,0) failed", (int) uid); + io_printf(f_out, "@ERROR: setreuid failed\n"); + return -1; + } + if...

...l_server) { if (read_batch) - create_flist_from_batch(); + create_flist_from_batch(); /* sets batch_flist */ ret = local_child(argc, args, f_in, f_out); } else { ret = piped_child(args,f_in,f_out); @@ -443,8 +443,8 @@ extern int am_daemon; extern int module_id; extern int am_sender; - extern int read_batch; /* dw */ - extern struct file_list *batch_flist; /* dw */ + extern int read_batch; + extern struct file_list *batch_flist; if (verbose > 2) rprintf(FINFO,"server_recv(%d) starting pid=%d\n",argc,(int)getpid()); @@ -470,7 +470,7 @@ if (delete_mode...

Hi, I'm having a problem rsyncing one file (since I signed it). It seems that the content of a file is able to cause problems in the protocol. building file list ... 28820 files to consider apt/packages/avifile/ apt/packages/avifile/avifile-0.7.34-1.dag.rh90.i386.rpm rsync: error writing 4 unbuffered bytes - exiting: Broken pipe rsync error: error in rsync protocol data stream (code

...he case of an inexistant directory is already handled in flist.c:send_directory(), that is probably also where to handle the case of the filename referring to a file not being a directory. See the attached patch. In fact, I am not sure that it is a good idea to just ignore ENOENT and ENOTDIR if !am_sender, since those should also possibly mean a real error. Or am I mistaken here? -- You are receiving this mail because: You are the QA Contact for the bug.

...============================= RCS file: /data/cvs/rsync/clientserver.c,v retrieving revision 1.69 diff -u -p -r1.69 clientserver.c --- clientserver.c 15 Aug 2001 06:44:44 -0000 1.69 +++ clientserver.c 22 Aug 2001 04:15:12 -0000 @@ -44,7 +44,8 @@ int start_socket_client(char *host, char extern int am_sender; extern struct in_addr socket_address; extern char *shell_cmd; - + extern int kludge_around_eof; + if (argc == 0 && !am_sender) { extern int list_only; list_only = 1; @@ -107,6 +108,10 @@ int start_socket_client(char *host, char if (p) *p = '/'; while (1) { + /...

We use rsync to update an nfs server. After an update, we noticed that a large number of clients didn't see the updated data. It took me a while to be able to reliably reproduce this problem, but it happens on old and new versions of rysnc. It also happens across all the platforms we use here (sun/linux/netapp). This shows the problem: [Note my home directory is NFS mounted]

...&& !backup_dir) { + rprintf(FERROR, + "--backup-dir must be specified with --backup-only\n"); + exit_cleanup(RERR_SYNTAX); + } + *argv = poptGetArgs(pc); if (*argv) *argc = count_args(*argv); @@ -879,6 +893,9 @@ args[ac++] = tmpdir; } + if (backup_only && am_sender) + args[ac++] = "--backup-only"; + if (compare_dest && am_sender) { /* the server only needs this option if it is not the sender, * and it may be an older version that doesn't know this diff -ur rsync/receiver.c rsync-backuponly/receiver.c --- rsync/receiver.c 20...

People of cygwin & rsync, I recently attempted to get cygwin and rsync working to solve a backup/mirroring need in my computer life. Well, as you might guess, I ran into a little but of trouble. Strangely enough, rsync seemed to be regularly hanging when I attempted to do a "get" (sycronize a remote to a local dir). Well, considering I want to automate this, that was not going