search for: rsync_nam

...ror; - - memset(&hints, 0, sizeof(hints)); - hints.ai_family = af_hint; - hints.ai_socktype = type; - hints.ai_flags = AI_PASSIVE; - snprintf(portbuf, sizeof(portbuf), "%d", port); - error = getaddrinfo(bind_address, portbuf, &hints, &all_ai); - if (error) { - rprintf(FERROR, RSYNC_NAME ": getaddrinfo: bind address %s: %s\n", - bind_address, gai_strerror(error)); - return -1; - } /* We may not be able to create the socket, if for example the * machine knows about IPv6 in the C library, but not in the * kernel. */ - for (resp = all_ai; resp; resp = resp->...

...0). This is on RedHat 7.2 btw. So the rprintf lines need to be changed to something like this: rprintf(FERROR,"write failed on %s : %s\n",fname, strerror(errno ? errno : ENOSPC)); Another small request while I have your attention. In main.c: rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", Could you prepend a newline to the beginning of this so it does not blend in with the last line of any transfer-related output? rprintf(FINFO, RSYNC_NAME "\n[%d] (%s%s%s) heap statistics:\n", Thanks. -- John Van Essen Uni...

...y; hints.ai_flags = AI_CANONNAME; hints.ai_socktype = SOCK_STREAM; - error = getaddrinfo(name_buf, port_buf, &hints, &res0); + error = getaddrinfo(name_buf, NULL, &hints, &res0); if (error) { rprintf(FERROR, RSYNC_NAME ": forward name lookup for %s failed: %s\n", -- John L. Allen, Dept 0631, EMS 516-346-8456, MS C06-001 Northrop Grumman Information Technology Internal Information Services -- <<JOHN.L.ALLEN.vcf>> -------------- next part ----------...

...install-strip: $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install --- flist.c.orig Sun Feb 3 07:08:14 2002 +++ flist.c Sun Feb 3 07:00:22 2002 @@ -89,8 +89,8 @@ { if (verbose && recurse && !am_server) { /* This overwrites the progress line, if any. */ - rprintf(FINFO, RSYNC_NAME ": %d files to consider.\n", - flist->count); + rprintf(FINFO, RSYNC_NAME ": %d file%sto consider.\n", + flist->count, flist->count==1?" ":"s "); } } -- | G r e g L o u i s | gpg public key: | | http://www.bgl.nu/~glou...

As I reported a while back rsync doesn't handle metadata (permissions and ownership) in dryrun mode. I offered to make a patch and that offer still stands. I didn't have the time for it until now and want to pick it up again. I had some ugly hack back then but I want to redo it in a clean way. I would like some input on my thoughts. IMHO, it would be ideally if the check for dry_run

...f the program where that is a problem + (start_socket_client), kludge_around_eof is True and we + just exit. + */ + + if (kludge_around_eof) + exit_cleanup (0); + else { + rprintf (FERROR, + "%s: connection unexpectedly closed " + "(%.0f bytes read so far)\n", + RSYNC_NAME, (double)stats.total_read); + + exit_cleanup (RERR_STREAMIO); + } +} -/* + +static void die_from_readerr (int err) +{ + /* this prevents us trying to write errors on a dead socket */ + io_multiplexing_close(); + + rprintf(FERROR, "%s: read error: %s\n", + RSYNC_NAME, strerror (e...

I've just upgraded my rsync server to 2.5.1 (before, I was using 2.4.6), without changing anything in /etc/rsyncd.conf, and now, I have this logs each time a client connect to server: 2002/01/07 18:33:03 [10432] rsync: reverse name lookup mismatch on fd3 - spoofed address? 2002/01/07 18:33:03 [10432] rsync on admin/sbin/padmin_update.sh from UNKNOWN (172.16.65.14) 2002/01/07 18:33:03 [10432]

OK, I packaged up the current CVS as our first preview release for 2.6.0. You can grab it here: http://samba.org/ftp/rsync/preview/rsync-2.6.0pre1.tar.gz The MD5 checksum is: 70e9dea967f083c231b7821ef35aef1b rsync-2.6.0pre1.tar.gz There is not currently a .sig file for the package, but I'm looking into that next. Please test this and let me know if we have any remaining issues

...struct file_struct *file = flist->files[i]; char *fnamecmp; @@ -389,7 +358,7 @@ if (statret == -1) { if (errno == ENOENT) { write_int(f_out,i); - if (!dry_run) send_sums(NULL,f_out); + if (!dry_run) send_null_sums(f_out); } else { if (verbose > 1) rprintf(FERROR, RSYNC_NAME @@ -406,7 +375,7 @@ /* now pretend the file didn't exist */ write_int(f_out,i); - if (!dry_run) send_sums(NULL,f_out); + if (!dry_run) send_null_sums(f_out); return; } @@ -435,7 +404,7 @@ if (disable_deltas_p()) { write_int(f_out,i); - send_sums(NULL,f_out);...

...read %.0f bytes %.2f bytes/sec\n", (double)stats.total_written, (double)stats.total_read, (stats.total_written+stats.total_read)/(0.5 + (t-starttime))); @@ -171,7 +171,7 @@ mi = mallinfo(); - rprintf(FINFO, RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", + rprintf(FINFO, "\n" RSYNC_NAME "[%d] (%s%s%s) heap statistics:\n", getpid(), am_server ? "server " : "", am_daemon ? "daemon " : "",...

...-1) > - errno = saveerrno; > - else > - fnamecmp = fnamecmpbuf; > - } > - > - if (statret == -1) { > - if (errno == ENOENT) { > - write_int(f_out,i); > - if (!dry_run) send_sums(NULL,f_out); > - } else { > - if (verbose > 1) > - rprintf(FERROR, RSYNC_NAME > - ": recv_generator failed to open \"%s\": %s\n", > - fname, strerror(errno)); > - } > - return; > - } > - > - if (!S_ISREG(st.st_mode)) { > - if (delete_file(fname) != 0) { > - return; > - } > - > - /* now pretend the file d...

...sin.sin_family = AF_INET; + struct addrinfo hint; + struct addrinfo *answer; + int err; + + memset(&hint, 0, sizeof(hint)); + + hint.ai_flags = AI_NUMERICHOST; + hint.ai_socktype = SOCK_STREAM; + + err = getaddrinfo(addr, NULL, &hint, &answer); + if (err) { + rprintf(FERROR, RSYNC_NAME ": malformed address %s: %s\n", + addr, gai_strerror(err)); + return name_buf; } + switch (answer->ai_family) { + case AF_INET: + memcpy(&ss, answer->ai_addr, sizeof(struct sockaddr_in)); + break; +#ifdef INET6 + case AF_INET6: + memcpy(&ss, answer...

...set w_fds, r_fds; int fd_count, count; struct timeval tv; + int time_expired = 0; msg_list_push(NORMAL_FLUSH); @@ -837,6 +891,19 @@ } sleep_for_bwlimit(ret); + + if( timelimit ) { + time_expired = has_timelimit_expired(); + if( 1 == time_expired ) { + rprintf(FERROR, RSYNC_NAME ": \n%d minute time limit exceeded.\n", timelimit); + exit_cleanup(RERR_PARTIAL); + } + } + + if( stopat && has_stopat_expired() ) { + rprintf(FERROR, RSYNC_NAME ": \n%s stopat time exceeded.\n", stopat); + exit_cleanup(RERR_PARTIAL); + } total...

...; (S_ISDIR(st.st_mode) == S_ISDIR(file->mode))) { @@ -313,6 +317,8 @@ if (dry_run) return; /* XXXX -- might cause inaccuracies?? -- mbp */ if (statret == 0 && !S_ISDIR(st.st_mode)) { + if (backup_only) + return; if (robust_unlink(fname) != 0) { rprintf(FERROR, RSYNC_NAME ": recv_generator: unlink \"%s\" to make room for directory: %s\n", @@ -321,6 +327,8 @@ } statret = -1; } + if (backup_only) + return; if (statret != 0 && do_mkdir(fname,file->mode) != 0 && errno != EEXIST) { if (!(relative_paths &a...

...bhints.ai_socktype = ai_socktype; bhints.ai_flags = AI_PASSIVE; - if (getaddrinfo(bind_address, NULL, &bhints, &bres_all) == -1) { + error = getaddrinfo(bind_address, NULL, &bhints, &bres_all); + if (error == -1) { rprintf(FERROR, RSYNC_NAME ": getaddrinfo %s: %s\n", bind_address, gai_strerror(error)); return -1; @@ -382,7 +384,7 @@ fd_set fds; int fd; struct sockaddr_storage addr; - int addrlen = sizeof(addr); +...

I prefer configurable RSYNCD_CONF by autoconf to RSYNCD_CONF in rsync.h. --- rsync.h.orig Tue Feb 19 06:46:49 2002 +++ rsync.h Thu Feb 21 00:59:11 2002 @@ -26,7 +26,8 @@ #define RSYNC_RSH_ENV "RSYNC_RSH" #define RSYNC_NAME "rsync" -#define RSYNCD_CONF "/etc/rsyncd.conf" + +/* RSYNCD_CONF is always set in config.h */ #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://" --- configure.in.orig Wed Feb 20 08:40:47 2002 +++ configure.in Thu Feb 21 01:26...

...in the user home directory isn't it more sensible to name that file dot-something ? diff -urN rsync-2.6.0/rsync.h rsync-2.6.0-new/rsync.h --- rsync-2.6.0/rsync.h 2003-12-16 23:04:59.000000000 +0000 +++ rsync-2.6.0-new/rsync.h 2004-04-19 15:39:12.000000000 +0100 @@ -28,7 +28,7 @@ #define RSYNC_NAME "rsync" #define RSYNCD_SYSCONF "/etc/rsyncd.conf" -#define RSYNCD_USERCONF "rsyncd.conf" +#define RSYNCD_USERCONF ".rsyncd" #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock" #define URL_PREFIX "rsync://"

Patch to add an archive mode that includes deletion. -Rob -------------- next part -------------- Adds an archive mode that includes the delete option. --- orig/options.c 2004-09-23 13:39:05.000000000 -0400 +++ options.c 2004-11-13 09:56:27.000000000 -0500 @@ -39,6 +39,7 @@ int whole_file = -1; int archive_mode = 0; +int archive_delete_mode = 0; int keep_dirlinks = 0; int copy_links = 0;

...ced that the copyright date range does not yet include 2008 :) Trivial patch: --- options.c.orig 2008-02-18 19:48:20.000000000 -0500 +++ options.c 2008-03-03 10:19:19.000000000 -0500 @@ -259,7 +259,7 @@ rprintf(f, "%s version %s protocol version %d%s\n", RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol); - rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n"); + rprintf(f, "Copyright (C) 1996-2008 by Andrew Tridgell, Wayne Davison, and others.\n"); rprintf(f, "Web site: htt...

..._out, sum2, sum.s2length); len -= n1; offset += n1; } @@ -384,7 +391,7 @@ if (statret == -1) { if (errno == ENOENT) { write_int(f_out,i); - if (!dry_run) send_null_sums(f_out); + if (!dry_run) write_sum_head(f_out, NULL); } else { if (verbose > 1) rprintf(FERROR, RSYNC_NAME @@ -401,7 +408,7 @@ /* now pretend the file didn't exist */ write_int(f_out,i); - if (!dry_run) send_null_sums(f_out); + if (!dry_run) write_sum_head(f_out, NULL); return; } @@ -430,7 +437,7 @@ if (disable_deltas_p()) { write_int(f_out,i); - send_null_sums(f_out); + w...