[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via d702b97 Mention the latest changes.
via 53a46d9 Fix two unused-variable compiler warnings.
from 510c5ab Fix xattr memory leak. Fixes bug 8475.
;a=shortlog;h=b3.0.x
- Log -
commit d702b978380aa1f6abf7f7bfc1e7fad4011a2660
Author: Wayne Davison way...@samba.org
Date: Thu Sep 22 23:33:51 2011 -0700
Mention the latest changes.
commit 53a46d9e09fff01aac6978d0d5f70dc550dfe1a4
Author: Wayne Davison way...@samba.org
Date: Thu Sep 22 23:31:18 2011 -0700
Fix two unused-variable compiler warnings.
---
Summary of changes:
NEWS |5 +
io.c |2 --
wildtest.c | 13 +
3 files changed, 14 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 980754e..53b7aca 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,11 @@ Changes since 3.0.8:
- Fix preservation of a symlink's system xattrs (e.g. selinux) on Linux.
+- Fix a memory leak in the xattr code.
+
+- Fixed a bug with --delete-excluded when a filter merge file has a rule
+ that specifies a receiver-only side restriction.
+
- Fix a bug with the modifying of unwritable directories.
- Fix --fake-super's interaction with --link-dest same-file comparisons.
diff --git a/io.c b/io.c
index b6db8e9..b8e52bf 100644
--- a/io.c
+++ b/io.c
@@ -1066,7 +1066,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t
len)
xbuf outbuf, inbuf;
char ibuf[512];
int add_null = 0;
- int pos = 0;
INIT_CONST_XBUF(outbuf, line);
INIT_XBUF(inbuf, ibuf, 0, -1);
@@ -1081,7 +1080,6 @@ static int readfd_unbuffered(int fd, char *buf, size_t
len)
if (iconvbufs(ic_send, inbuf, outbuf,
ICB_INCLUDE_BAD |
ICB_INCLUDE_INCOMPLETE) 0)
goto overflow;
- pos = -1;
}
if (add_null) {
if (outbuf.len == outbuf.size)
diff --git a/wildtest.c b/wildtest.c
index bd1f4cc..7691b6c 100644
--- a/wildtest.c
+++ b/wildtest.c
@@ -50,15 +50,16 @@ static struct poptOption long_options[] = {
/* match just at the start of string (anchored tests) */
static void
-run_test(int line, bool matches, bool same_as_fnmatch,
+run_test(int line, bool matches,
+#ifdef COMPARE_WITH_FNMATCH
+bool same_as_fnmatch,
+#endif
const char *text, const char *pattern)
{
bool matched;
#ifdef COMPARE_WITH_FNMATCH
bool fn_matched;
int flags = strstr(pattern, **)? 0 : FNM_PATHNAME;
-#else
-same_as_fnmatch = 0; /* Get rid of unused-variable compiler warning. */
#endif
if (explode_mod) {
@@ -194,7 +195,11 @@ main(int argc, char **argv)
while (*++s == ' ' || *s == '\t') {}
}
*end[0] = *end[1] = '\0';
- run_test(line, flag[0], flag[1], string[0], string[1]);
+ run_test(line, flag[0],
+#ifdef COMPARE_WITH_FNMATCH
+flag[1],
+#endif
+string[0], string[1]);
}
if (!wildmatch_errors)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 40afd36 Preparing for release of 3.0.9
from d702b97 Mention the latest changes.
;a=shortlog;h=b3.0.x
- Log -
commit 40afd365cc8ca968fd16e161d24df5b8a8a520cc
Author: Wayne Davison way...@samba.org
Date: Fri Sep 23 09:13:53 2011 -0700
Preparing for release of 3.0.9
---
Summary of changes:
NEWS |2 +-
OLDNEWS |2 +-
configure.ac |2 +-
packaging/lsb/rsync.spec | 10 +-
rsync.yo |4 ++--
rsyncd.conf.yo |4 ++--
6 files changed, 12 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 53b7aca..8510288 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-NEWS for rsync 3.0.9 (UNRELEASED)
+NEWS for rsync 3.0.9 (23 Sep 2011)
Protocol: 30 (unchanged)
Changes since 3.0.8:
diff --git a/OLDNEWS b/OLDNEWS
index 9774c08..7603970 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3235,7 +3235,7 @@ Changes since 2.4.6:
Partial Protocol History
RELEASE DATEVER.DATE OF COMMIT* PROTOCOL
- ?? Sep 2011 3.0.9 30
+ 23 Sep 2011 3.0.9 30
26 Mar 2011 3.0.8 30
31 Dec 2009 3.0.7 30
08 May 2009 3.0.6 30
diff --git a/configure.ac b/configure.ac
index 1cdce25..a9ee0a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.59)
-RSYNC_VERSION=3.0.9pre2
+RSYNC_VERSION=3.0.9
AC_SUBST(RSYNC_VERSION)
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index 5c2e211..37e26b1 100644
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,9 +1,9 @@
Summary: A fast, versatile, remote (and local) file-copying tool
Name: rsync
Version: 3.0.9
-%define fullversion %{version}pre2
-Release: 0.1.pre2
-%define srcdir src-previews
+%define fullversion %{version}
+Release: 1
+%define srcdir src
Group: Applications/Internet
Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
#Source1:
http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-patches-%{fullversion}.tar.gz
@@ -66,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/rsyncd.conf.5*
%changelog
-* Sat Sep 10 2011 Wayne Davison way...@samba.org
-Released 3.0.9pre2.
+* Fri Sep 23 2011 Wayne Davison way...@samba.org
+Released 3.0.9.
* Fri Mar 21 2008 Wayne Davison way...@samba.org
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.yo b/rsync.yo
index d1605ad..4c07c8d 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsync)(1)(10 Sep 2011)()()
+manpage(rsync)(1)(23 Sep 2011)()()
manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
manpagesynopsis()
@@ -3025,7 +3025,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.9pre2 of rsync.
+This man page is current for version 3.0.9 of rsync.
manpagesection(INTERNAL OPTIONS)
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 902bb94..921f6b4 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsyncd.conf)(5)(10 Sep 2011)()()
+manpage(rsyncd.conf)(5)(23 Sep 2011)()()
manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
manpagesynopsis()
@@ -706,7 +706,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.9pre2 of rsync.
+This man page is current for version 3.0.9 of rsync.
manpagesection(CREDITS)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 510c5ab Fix xattr memory leak. Fixes bug 8475.
from 033697d Make --delete-excluded work better with --filter=merge.
;a=shortlog;h=b3.0.x
- Log -
commit 510c5ab7ff0c6b2d0d8794e285259238234c4b96
Author: Wayne Davison way...@samba.org
Date: Thu Sep 22 09:02:21 2011 -0700
Fix xattr memory leak. Fixes bug 8475.
---
Summary of changes:
xattrs.c |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/xattrs.c b/xattrs.c
index 7b5c1b1..d4c3c3b 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -93,11 +93,14 @@ static void rsync_xal_free(item_list *xalp)
size_t i;
rsync_xa *rxas = xalp-items;
+ if (!xalp-malloced)
+ return;
+
for (i = 0; i xalp-count; i++) {
free(rxas[i].datum);
/*free(rxas[i].name);*/
}
- xalp-count = 0;
+ free(xalp-items);
}
void free_xattr(stat_x *sxp)
@@ -772,10 +775,8 @@ void uncache_tmp_xattrs(void)
item_list *xattr_start = xattr_item + prior_xattr_count;
xattr_item += rsync_xal_l.count;
rsync_xal_l.count = prior_xattr_count;
- while (xattr_item-- xattr_start) {
+ while (xattr_item-- xattr_start)
rsync_xal_free(xattr_item);
- free(xattr_item-items);
- }
prior_xattr_count = (size_t)-1;
}
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 033697d Make --delete-excluded work better with --filter=merge. via abc7966 When modifying PATH, export it (for Solaris). from 998df4b Added SORTED TRANSFER ORDER manpage section. ;a=shortlog;h=b3.0.x - Log - commit 033697d96db0d28fe7b68a191665a8db80375bdb Author: Wayne Davison way...@samba.org Date: Thu Sep 15 07:40:50 2011 -0700 Make --delete-excluded work better with --filter=merge. commit abc796661d6d3a5b37cb0642e7e9885f6a271d60 Author: Wayne Davison way...@samba.org Date: Thu Sep 15 07:27:23 2011 -0700 When modifying PATH, export it (for Solaris). --- Summary of changes: exclude.c |8 ++-- runtests.sh |5 - 2 files changed, 6 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/exclude.c b/exclude.c index 6101dda..c8edec5 100644 --- a/exclude.c +++ b/exclude.c @@ -901,13 +901,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, exit_cleanup(RERR_SYNTAX); } - /* --delete-excluded turns an un-modified include/exclude into a -* sender-side rule. We also affect per-dir merge files that take -* no prefixes as a simple optimization. */ + /* --delete-excluded turns an un-modified include/exclude into a sender-side rule. */ if (delete_excluded - !(new_mflags (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE)) - (!(new_mflags MATCHFLG_PERDIR_MERGE) - || new_mflags MATCHFLG_NO_PREFIXES)) + !(new_mflags (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE|MATCHFLG_MERGE_FILE|MATCHFLG_PERDIR_MERGE))) new_mflags |= MATCHFLG_SENDER_SIDE; *len_ptr = len; diff --git a/runtests.sh b/runtests.sh index 41d566b..490795e 100755 --- a/runtests.sh +++ b/runtests.sh @@ -129,7 +129,10 @@ RUNSHFLAGS='-e' export RUNSHFLAGS # for Solaris -[ -d /usr/xpg4/bin ] PATH=/usr/xpg4/bin/:$PATH +if [ -d /usr/xpg4/bin ]; then +PATH=/usr/xpg4/bin/:$PATH +export PATH +fi if [ x$loglevel != x ] [ $loglevel -gt 8 ]; then if set -x; then -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via dbd58bb Improve the usage for --help. from a5ef696 Preparing for release of 3.0.9pre2 ;a=shortlog;h=b3.0.x - Log - commit dbd58bb2d01b28df2ba8a3bd0fc0bed69bbd24df Author: Wayne Davison way...@samba.org Date: Sun Sep 11 22:46:57 2011 -0700 Improve the usage for --help. --- Summary of changes: options.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/options.c b/options.c index b010067..374864a 100644 --- a/options.c +++ b/options.c @@ -433,7 +433,7 @@ void usage(enum logcode F) rprintf(F, -4, --ipv4 prefer IPv4\n); rprintf(F, -6, --ipv6 prefer IPv6\n); rprintf(F, --version print version number\n); - rprintf(F,(-h) --help show this help (-h works with no other options)\n); + rprintf(F,(-h) --help show this help (-h is --help only if used alone)\n); rprintf(F,\n); rprintf(F,Use \rsync --daemon --help\ to see the daemon-mode command-line options.\n); -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via ae6dea7 Mention the latest changes in the NEWS.
via 5a9933c Error out if --password-file specifed and it fails. Fixes
bug 8440.
via b91ab5f Dirs need +rx as well as +w for non-super xfers. Partial
fix for bug 8242.
from 5340571 Move implied_dot_dir=1, just to be safe.
;a=shortlog;h=b3.0.x
- Log -
commit ae6dea711d77d189ec7ff098fd3eaa9842fb8a16
Author: Wayne Davison way...@samba.org
Date: Sat Sep 10 13:40:48 2011 -0700
Mention the latest changes in the NEWS.
commit 5a9933c85cca18f0b3991a93e40bc8b00b23ed8c
Author: Wayne Davison way...@samba.org
Date: Tue Sep 6 21:18:32 2011 -0700
Error out if --password-file specifed and it fails.
Fixes bug 8440.
commit b91ab5f9c87b5e725e838bd386fe8e9cc3cb28d6
Author: Wayne Davison way...@samba.org
Date: Sat Sep 3 12:40:12 2011 -0700
Dirs need +rx as well as +w for non-super xfers.
Partial fix for bug 8242.
---
Summary of changes:
NEWS | 26 ++
authenticate.c | 36 ++--
generator.c| 11 ++-
3 files changed, 46 insertions(+), 27 deletions(-)
Changeset truncated at 500 lines:
diff --git a/NEWS b/NEWS
index 670f402..980754e 100644
--- a/NEWS
+++ b/NEWS
@@ -17,9 +17,35 @@ Changes since 3.0.8:
- Fix the updating of the curr_dir buffer to avoid a duplicate slash.
+- Fix the directory permissions on an implied dot-dir when using --relative
+ (e.g. /outside/path/././send/path).
+
+- Fixed some too-long sleeping instances when using --bwlimit.
+
+- Fixed when symlink ownership difference-checking gets compiled into
+ unchanged_attrs().
+
+- Improved the socket-error reporting when multiple protocols fail.
+
+- Fixed a case where a socket error could reference just-freed memory.
+
+- Failing to use a password file that was specified on the command-line is
+ now a fatal error.
+
+- Fix the non-root updating of directories that don't have the read and/or
+ execute permission.
+
- Make daemon-excluded file errors more error-like.
- Fix a compilation issue on older C compilers (due to a misplaced var
declaration).
+- Make configure avoid finding socketpair on cygwin.
+
+- Avoid trying to reference SO_BROADCAST if the OS doesn't support it.
+
- Fix some issues with the post-processing of the man pages.
+
+- Fixed the user home-dir handling in the support/lsh script.
+
+- Some minor manpage improvements.
diff --git a/authenticate.c b/authenticate.c
index 3af7337..7650377 100644
--- a/authenticate.c
+++ b/authenticate.c
@@ -156,36 +156,27 @@ static const char *getpassf(const char *filename)
{
STRUCT_STAT st;
char buffer[512], *p;
- int fd, n, ok = 1;
- const char *envpw = getenv(RSYNC_PASSWORD);
+ int fd, n;
if (!filename)
return NULL;
if ((fd = open(filename,O_RDONLY)) 0) {
- rsyserr(FWARNING, errno, could not open password file \%s\,
- filename);
- if (envpw)
- rprintf(FINFO, falling back to RSYNC_PASSWORD
environment variable.\n);
- return NULL;
+ rsyserr(FERROR, errno, could not open password file %s,
filename);
+ exit_cleanup(RERR_SYNTAX);
}
if (do_stat(filename, st) == -1) {
- rsyserr(FWARNING, errno, stat(%s), filename);
- ok = 0;
- } else if ((st.st_mode 06) != 0) {
- rprintf(FWARNING, password file must not be
other-accessible\n);
- ok = 0;
- } else if (MY_UID() == 0 st.st_uid != 0) {
- rprintf(FWARNING, password file must be owned by root when
running as root\n);
- ok = 0;
+ rsyserr(FERROR, errno, stat(%s), filename);
+ exit_cleanup(RERR_SYNTAX);
}
- if (!ok) {
- close(fd);
- rprintf(FWARNING, continuing without password file\n);
- if (envpw)
- rprintf(FINFO, falling back to RSYNC_PASSWORD
environment variable.\n);
- return NULL;
+ if ((st.st_mode 06) != 0) {
+ rprintf(FERROR, ERROR: password file must not be
other-accessible\n);
+ exit_cleanup(RERR_SYNTAX);
+ }
+ if (MY_UID() == 0 st.st_uid != 0) {
+ rprintf(FERROR, ERROR: password file must be owned by root
when running as root\n);
+ exit_cleanup(RERR_SYNTAX);
}
n = read(fd, buffer, sizeof buffer - 1);
@@ -196,7 +187,8 @@ static const char *getpassf(const char *filename)
return strdup(p);
}
- return NULL;
+ rprintf(FERROR, ERROR: failed to read a
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via a5ef696 Preparing for release of 3.0.9pre2
from ae6dea7 Mention the latest changes in the NEWS.
;a=shortlog;h=b3.0.x
- Log -
commit a5ef6969530e4616112999be9330cc442bcba7b7
Author: Wayne Davison way...@samba.org
Date: Sat Sep 10 14:52:19 2011 -0700
Preparing for release of 3.0.9pre2
---
Summary of changes:
OLDNEWS |2 +-
configure.ac |2 +-
packaging/lsb/rsync.spec |8
rsync.yo |4 ++--
rsyncd.conf.yo |4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/OLDNEWS b/OLDNEWS
index 927b515..9774c08 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3235,7 +3235,7 @@ Changes since 2.4.6:
Partial Protocol History
RELEASE DATEVER.DATE OF COMMIT* PROTOCOL
- ?? Jun 2011 3.0.9 30
+ ?? Sep 2011 3.0.9 30
26 Mar 2011 3.0.8 30
31 Dec 2009 3.0.7 30
08 May 2009 3.0.6 30
diff --git a/configure.ac b/configure.ac
index 21a6098..1cdce25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.59)
-RSYNC_VERSION=3.0.9pre1
+RSYNC_VERSION=3.0.9pre2
AC_SUBST(RSYNC_VERSION)
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index 0171911..5c2e211 100644
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,8 +1,8 @@
Summary: A fast, versatile, remote (and local) file-copying tool
Name: rsync
Version: 3.0.9
-%define fullversion %{version}pre1
-Release: 0.1.pre1
+%define fullversion %{version}pre2
+Release: 0.1.pre2
%define srcdir src-previews
Group: Applications/Internet
Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
@@ -66,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/rsyncd.conf.5*
%changelog
-* Wed Jun 22 2011 Wayne Davison way...@samba.org
-Released 3.0.9pre1.
+* Sat Sep 10 2011 Wayne Davison way...@samba.org
+Released 3.0.9pre2.
* Fri Mar 21 2008 Wayne Davison way...@samba.org
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.yo b/rsync.yo
index 2dfa16c..f8bcb5f 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsync)(1)(22 Jun 2011)()()
+manpage(rsync)(1)(10 Sep 2011)()()
manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
manpagesynopsis()
@@ -3002,7 +3002,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.9pre1 of rsync.
+This man page is current for version 3.0.9pre2 of rsync.
manpagesection(INTERNAL OPTIONS)
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 0f5215c..902bb94 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsyncd.conf)(5)(22 Jun 2011)()()
+manpage(rsyncd.conf)(5)(10 Sep 2011)()()
manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
manpagesynopsis()
@@ -706,7 +706,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.9pre1 of rsync.
+This man page is current for version 3.0.9pre2 of rsync.
manpagesection(CREDITS)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via e7dd0e5 Fix sending of . attributes for implied-dot-dir.
via 5822f98 Fix bwlimit multiplication overflow. Fixes bug 8375.
via 881455f Some option-parsing clarifiation in the intro.
from fe2c165 Fix misplaced parens on getnameinfo() call.
;a=shortlog;h=b3.0.x
- Log -
commit e7dd0e5004d6760bbd96991d2833e9f5cb64e7bd
Author: Wayne Davison way...@samba.org
Date: Sat Aug 27 11:56:57 2011 -0700
Fix sending of . attributes for implied-dot-dir.
commit 5822f988f54140c09909d406247593b48fb5ea09
Author: Wayne Davison way...@samba.org
Date: Sat Aug 27 10:28:20 2011 -0700
Fix bwlimit multiplication overflow. Fixes bug 8375.
commit 881455f7b2dae46d5f837221fc58968dcf1d90d4
Author: Wayne Davison way...@samba.org
Date: Sat Aug 27 10:07:28 2011 -0700
Some option-parsing clarifiation in the intro.
---
Summary of changes:
flist.c | 21 +
io.c |2 +-
rsync.yo | 16 +++-
3 files changed, 25 insertions(+), 14 deletions(-)
Changeset truncated at 500 lines:
diff --git a/flist.c b/flist.c
index 9e5bdd0..cbd837c 100644
--- a/flist.c
+++ b/flist.c
@@ -2102,12 +2102,8 @@ struct file_list *send_file_list(int f, int argc, char
*argv[])
fn = fbuf;
/* A leading ./ can be used in relative mode to affect
* the dest dir without its name being in the path. */
- if (*fn == '.' fn[1] == '/' !implied_dot_dir) {
- send_file_name(f, flist, ., NULL,
- (flags | FLAG_IMPLIED_DIR)
~FLAG_CONTENT_DIR,
- ALL_FILTERS);
- implied_dot_dir = 1;
- }
+ if (*fn == '.' fn[1] == '/' fn[2]
!implied_dot_dir)
+ implied_dot_dir = -1;
len = clean_fname(fn, CFN_KEEP_TRAILING_SLASH
| CFN_DROP_TRAILING_DOT_DIR);
if (len == 1) {
@@ -2145,11 +2141,20 @@ struct file_list *send_file_list(int f, int argc, char
*argv[])
dirlen = dir ? strlen(dir) : 0;
if (dirlen != lastdir_len || memcmp(lastdir, dir, dirlen) != 0)
{
if (!change_pathname(NULL, dir, -dirlen))
- continue;
+ goto bad_path;
lastdir = pathname;
lastdir_len = pathname_len;
- } else if (!change_pathname(NULL, lastdir, lastdir_len))
+ } else if (!change_pathname(NULL, lastdir, lastdir_len)) {
+ bad_path:
+ if (implied_dot_dir 0)
+ implied_dot_dir = 0;
continue;
+ }
+
+ if (implied_dot_dir 0) {
+ send_file_name(f, flist, ., NULL, (flags |
FLAG_IMPLIED_DIR) ~FLAG_CONTENT_DIR, ALL_FILTERS);
+ implied_dot_dir = 1;
+ }
if (fn != fbuf)
memmove(fbuf, fn, len + 1);
diff --git a/io.c b/io.c
index 80cb4b6..b6db8e9 100644
--- a/io.c
+++ b/io.c
@@ -1406,7 +1406,7 @@ static void sleep_for_bwlimit(int bytes_written)
if (prior_tv.tv_sec) {
elapsed_usec = (start_tv.tv_sec - prior_tv.tv_sec) * ONE_SEC
+ (start_tv.tv_usec - prior_tv.tv_usec);
- total_written -= elapsed_usec * bwlimit / (ONE_SEC/1024);
+ total_written -= (int64)elapsed_usec * bwlimit / (ONE_SEC/1024);
if (total_written 0)
total_written = 0;
}
diff --git a/rsync.yo b/rsync.yo
index d2a16fd..2dfa16c 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -451,11 +451,17 @@ accepted: verb(
manpageoptions()
-rsync uses the GNU long options package. Many of the command line
-options have two variants, one short and one long. These are shown
-below, separated by commas. Some options only have a long variant.
-The '=' for options that take a parameter is optional; whitespace
-can be used instead.
+Rsync accepts both long (double-dash + word) and short (single-dash + letter)
+options. The full list of the available options are described below. If an
+option can be specified in more than one way, the choices are comma-separated.
+Some options only have a long variant, not a short. If the option takes a
+parameter, the parameter is only listed after the long variant, even though it
+must also be specified for the short. When specifying a parameter, you can
+either use the form --option=param or replace the '=' with whitespace. The
+parameter may need to be quoted in some
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 5340571 Move implied_dot_dir=1, just to be safe.
from e7dd0e5 Fix sending of . attributes for implied-dot-dir.
;a=shortlog;h=b3.0.x
- Log -
commit 5340571ab6c29ebe15d4352fcd77d2f2d3ff2fc1
Author: Wayne Davison way...@samba.org
Date: Sat Aug 27 14:58:04 2011 -0700
Move implied_dot_dir=1, just to be safe.
---
Summary of changes:
flist.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/flist.c b/flist.c
index cbd837c..25d5c8c 100644
--- a/flist.c
+++ b/flist.c
@@ -2152,8 +2152,8 @@ struct file_list *send_file_list(int f, int argc, char
*argv[])
}
if (implied_dot_dir 0) {
- send_file_name(f, flist, ., NULL, (flags |
FLAG_IMPLIED_DIR) ~FLAG_CONTENT_DIR, ALL_FILTERS);
implied_dot_dir = 1;
+ send_file_name(f, flist, ., NULL, (flags |
FLAG_IMPLIED_DIR) ~FLAG_CONTENT_DIR, ALL_FILTERS);
}
if (fn != fbuf)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via fe2c165 Fix misplaced parens on getnameinfo() call.
via 4c0055e Ignore socketpair() on cygwin. Fixes bug 8356.
from d706e88 Fix Minix build errors. Fixes bug 8313.
;a=shortlog;h=b3.0.x
- Log -
commit fe2c165fca8bd5e9fa9660378647841e6b5a08d4
Author: Wayne Davison way...@samba.org
Date: Sat Aug 6 11:21:40 2011 -0700
Fix misplaced parens on getnameinfo() call.
commit 4c0055ecbb51f7fbc878229ec615f93e1adc506f
Author: Wayne Davison way...@samba.org
Date: Sat Aug 6 11:18:54 2011 -0700
Ignore socketpair() on cygwin. Fixes bug 8356.
---
Summary of changes:
configure.ac |4
socket.c |4 ++--
2 files changed, 6 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 86f1793..21a6098 100644
--- a/configure.ac
+++ b/configure.ac
@@ -675,7 +675,11 @@ AC_TRY_RUN([
main() {
int fd[2];
+#ifdef __CYGWIN__
+ exit(1);
+#else
exit((socketpair(AF_UNIX, SOCK_STREAM, 0, fd) != -1) ? 0 : 1);
+#endif
}],
rsync_cv_HAVE_SOCKETPAIR=yes,rsync_cv_HAVE_SOCKETPAIR=no,rsync_cv_HAVE_SOCKETPAIR=cross)])
if test x$rsync_cv_HAVE_SOCKETPAIR = xyes; then
diff --git a/socket.c b/socket.c
index c373056..b0d5475 100644
--- a/socket.c
+++ b/socket.c
@@ -303,7 +303,7 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
}
if (verbose = 3) {
char buf[2048];
- if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
+ if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0)
snprintf(buf, sizeof buf, *getnameinfo
failure: %s*, gai_strerror(error));
rprintf(FINFO, Connected to %s (%s)\n, h, buf);
}
@@ -315,7 +315,7 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
for (res = res0, j = 0; res; res = res-ai_next, j++) {
if (errnos[j] == 0)
continue;
- if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
+ if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST)) != 0)
snprintf(buf, sizeof buf, *getnameinfo
failure: %s*, gai_strerror(error));
rsyserr(FERROR, errnos[j], failed to connect to %s
(%s), h, buf);
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via d706e88 Fix Minix build errors. Fixes bug 8313.
from c0d07c0 Replace another inet_ntop() call with getnameinfo().
;a=shortlog;h=b3.0.x
- Log -
commit d706e888fcd65e06d95302471db648ec1d33683e
Author: Wayne Davison way...@samba.org
Date: Fri Jul 22 11:17:57 2011 -0700
Fix Minix build errors. Fixes bug 8313.
---
Summary of changes:
configure.ac |2 +-
socket.c |6 ++
2 files changed, 7 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 5b6dd85..86f1793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -331,7 +331,7 @@ AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h
sys/time.h sys/unistd.h \
sys/un.h sys/attr.h mcheck.h arpa/inet.h arpa/nameser.h locale.h \
netdb.h malloc.h float.h limits.h iconv.h libcharset.h langinfo.h \
sys/acl.h acl/libacl.h attr/xattr.h sys/xattr.h sys/extattr.h \
-popt.h popt/popt.h)
+popt.h popt/popt.h netinet/in_systm.h netinet/ip.h)
AC_HEADER_MAJOR
AC_CACHE_CHECK([if makedev takes 3 args],rsync_cv_MAKEDEV_TAKES_3_ARGS,[
diff --git a/socket.c b/socket.c
index dc9e325..c373056 100644
--- a/socket.c
+++ b/socket.c
@@ -26,8 +26,12 @@
#include rsync.h
#include ifuncs.h
+#ifdef HAVE_NETINET_IN_SYSTM_H
#include netinet/in_systm.h
+#endif
+#ifdef HAVE_NETINET_IP_H
#include netinet/ip.h
+#endif
#include netinet/tcp.h
extern char *bind_address;
@@ -642,7 +646,9 @@ struct
} socket_options[] = {
{SO_KEEPALIVE, SOL_SOCKET,SO_KEEPALIVE,0,
OPT_BOOL},
{SO_REUSEADDR, SOL_SOCKET,SO_REUSEADDR,0,
OPT_BOOL},
+#ifdef SO_BROADCAST
{SO_BROADCAST, SOL_SOCKET,SO_BROADCAST,0,
OPT_BOOL},
+#endif
#ifdef TCP_NODELAY
{TCP_NODELAY, IPPROTO_TCP, TCP_NODELAY, 0,
OPT_BOOL},
#endif
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c0d07c0 Replace another inet_ntop() call with getnameinfo().
from 606c603 Add more connect debug info, as Carlos suggested.
;a=shortlog;h=b3.0.x
- Log -
commit c0d07c098724ee8c382a498cab991f7d8467d778
Author: Wayne Davison way...@samba.org
Date: Sat Jul 16 15:42:32 2011 -0700
Replace another inet_ntop() call with getnameinfo().
---
Summary of changes:
clientserver.c |2 +-
socket.c |9 -
2 files changed, 5 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/clientserver.c b/clientserver.c
index 038900e..f3e2c04 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -1071,7 +1071,7 @@ int daemon_main(void)
rprintf(FLOG, rsyncd version %s starting, listening on port %d\n,
RSYNC_VERSION, rsync_port);
/* TODO: If listening on a particular address, then show that
-* address too. In fact, why not just do inet_ntop on the
+* address too. In fact, why not just do getnameinfo on the
* local address??? */
start_accept_loop(rsync_port, start_daemon);
diff --git a/socket.c b/socket.c
index 855fc09..dc9e325 100644
--- a/socket.c
+++ b/socket.c
@@ -300,9 +300,8 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
if (verbose = 3) {
char buf[2048];
if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
- rprintf(FINFO, error in getnameinfo: %s\n,
gai_strerror(error));
- else
- rprintf(FINFO, Connected to %s (%s)\n, h,
buf);
+ snprintf(buf, sizeof buf, *getnameinfo
failure: %s*, gai_strerror(error));
+ rprintf(FINFO, Connected to %s (%s)\n, h, buf);
}
break;
}
@@ -312,8 +311,8 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
for (res = res0, j = 0; res; res = res-ai_next, j++) {
if (errnos[j] == 0)
continue;
- if (inet_ntop(res-ai_family, res-ai_addr-sa_data +
2, buf, sizeof buf) == NULL)
- strlcpy(buf, *inet_ntop failed*, sizeof buf);
+ if ((error = getnameinfo(res-ai_addr, res-ai_addrlen,
buf, sizeof buf, NULL, 0, NI_NUMERICHOST) != 0))
+ snprintf(buf, sizeof buf, *getnameinfo
failure: %s*, gai_strerror(error));
rsyserr(FERROR, errnos[j], failed to connect to %s
(%s), h, buf);
}
if (s 0)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 5fed6c0 Move freeaddrinfo() call after failure-reporting loop.
from 30fb28c Mention the latest fixes.
;a=shortlog;h=b3.0.x
- Log -
commit 5fed6c076a76b168d6c6bae59ea9b7f41fb7dbe7
Author: Wayne Davison way...@samba.org
Date: Mon Jul 11 18:15:51 2011 -0700
Move freeaddrinfo() call after failure-reporting loop.
---
Summary of changes:
socket.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/socket.c b/socket.c
index 89a636f..f2f79f7 100644
--- a/socket.c
+++ b/socket.c
@@ -299,7 +299,6 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
}
break;
}
- freeaddrinfo(res0);
if (s 0) {
char buf[2048];
@@ -313,6 +312,7 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
s = -1;
}
+ freeaddrinfo(res0);
free(errnos);
return s;
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 1916a7a Handle FES_NO_SEND properly on a hard-linked file. Fixes
bug 8246.
from 121082f Fix #ifdef in unchanged_attrs(). Fixes bug 8268.
;a=shortlog;h=b3.0.x
- Log -
commit 1916a7a2a6c1ed354f827c612cf70f7177a67153
Author: Wayne Davison way...@samba.org
Date: Mon Jul 4 16:02:12 2011 -0700
Handle FES_NO_SEND properly on a hard-linked file.
Fixes bug 8246.
---
Summary of changes:
generator.c |8 +++-
io.c|8 ++--
2 files changed, 13 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index 089672e..da6138a 100644
--- a/generator.c
+++ b/generator.c
@@ -2142,10 +2142,16 @@ void check_for_finished_files(int itemizing, enum
logcode code, int check_redo)
while (1) {
#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links (ndx = get_hlink_num()) != -1) {
+ int send_failed = (ndx == -2);
+ if (send_failed)
+ ndx = get_hlink_num();
flist = flist_for_ndx(ndx,
check_for_finished_files.1);
file = flist-files[ndx - flist-ndx_start];
assert(file-flags FLAG_HLINKED);
- finish_hard_link(file, f_name(file, fbuf), ndx, NULL,
itemizing, code, -1);
+ if (send_failed)
+ handle_skipped_hlink(file, itemizing, code,
sock_f_out);
+ else
+ finish_hard_link(file, f_name(file, fbuf), ndx,
NULL, itemizing, code, -1);
flist-in_progress--;
continue;
}
diff --git a/io.c b/io.c
index 0041000..80cb4b6 100644
--- a/io.c
+++ b/io.c
@@ -177,13 +177,19 @@ static void got_flist_entry_status(enum festatus status,
const char *buf)
case FES_SUCCESS:
if (remove_source_files)
send_msg(MSG_SUCCESS, buf, 4, 0);
+ /* FALL THROUGH */
+ case FES_NO_SEND:
+#ifdef SUPPORT_HARD_LINKS
if (preserve_hard_links) {
struct file_struct *file = flist-files[ndx -
flist-ndx_start];
if (F_IS_HLINKED(file)) {
+ if (status == FES_NO_SEND)
+ flist_ndx_push(hlink_list, -2); /*
indicates a failure follows */
flist_ndx_push(hlink_list, ndx);
flist-in_progress++;
}
}
+#endif
break;
case FES_REDO:
if (read_batch) {
@@ -195,8 +201,6 @@ static void got_flist_entry_status(enum festatus status,
const char *buf)
flist-to_redo++;
flist_ndx_push(redo_list, ndx);
break;
- case FES_NO_SEND:
- break;
}
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 3a2495c Fix a comment. from 1916a7a Handle FES_NO_SEND properly on a hard-linked file. Fixes bug 8246. ;a=shortlog;h=b3.0.x - Log - commit 3a2495cb22bdc29f91ee328e5c76c3fb364314aa Author: Wayne Davison way...@samba.org Date: Mon Jul 4 16:31:58 2011 -0700 Fix a comment. --- Summary of changes: support/mnt-excl |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/support/mnt-excl b/support/mnt-excl index e741865..b2926db 100755 --- a/support/mnt-excl +++ b/support/mnt-excl @@ -18,7 +18,7 @@ # easily adapted to read /etc/mtab or similar. # # ADDENDUM: The addition of the --filter option (which has support for -# absolute-anchored excludes) can make this screen unneeded in some +# absolute-anchored excludes) can make this script unneeded in some # scenarios. If you don't need delete protection on the receiving side # (or if the destination path is identical to the source path), then you # can exclude some absolute paths from the transfer based on the mount -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 30fb28c Mention the latest fixes. from 3a2495c Fix a comment. ;a=shortlog;h=b3.0.x - Log - commit 30fb28cc97b60d736c3f1b44f0bd73309cb79384 Author: Wayne Davison way...@samba.org Date: Mon Jul 4 16:36:41 2011 -0700 Mention the latest fixes. --- Summary of changes: NEWS |6 ++ 1 files changed, 6 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 234ef56..670f402 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,9 @@ Changes since 3.0.8: - Fix a crash bug in checksum scanning when --inplace is used. +- Fix a hang if a hard-linked file cannot be opened by the sender (e.g. + if it has no read permission). + - Fix preservation of a symlink's system xattrs (e.g. selinux) on Linux. - Fix a bug with the modifying of unwritable directories. @@ -16,4 +19,7 @@ Changes since 3.0.8: - Make daemon-excluded file errors more error-like. +- Fix a compilation issue on older C compilers (due to a misplaced var + declaration). + - Fix some issues with the post-processing of the man pages. -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 121082f Fix #ifdef in unchanged_attrs(). Fixes bug 8268. from c6bed2d Explicitly mention spaces in the path setting. ;a=shortlog;h=b3.0.x - Log - commit 121082fa9b375666e06a8fc6e476aaecb307079f Author: Wayne Davison way...@samba.org Date: Sun Jun 26 09:52:40 2011 -0700 Fix #ifdef in unchanged_attrs(). Fixes bug 8268. --- Summary of changes: generator.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/generator.c b/generator.c index d7e1ba8..089672e 100644 --- a/generator.c +++ b/generator.c @@ -630,7 +630,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp) if (perms_differ(file, sxp)) return 0; #endif -#ifndef CAN_CHOWN_SYMLINK +#ifdef CAN_CHOWN_SYMLINK if (ownership_differs(file, sxp)) return 0; #endif -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c6bed2d Explicitly mention spaces in the path setting.
via ecae885 Improve lsh's handling of -l user option w/cd.
via f350413 Move var declaration for older C compilers.
from 93bdc64 Preparing for release of 3.0.9pre1
;a=shortlog;h=b3.0.x
- Log -
commit c6bed2d9eee2dda657ed2e5d2200565cf92264bd
Author: Wayne Davison way...@samba.org
Date: Mon May 16 11:24:07 2011 -0700
Explicitly mention spaces in the path setting.
commit ecae885a5194cf2c23fda2968845bded2802b84d
Author: Wayne Davison way...@samba.org
Date: Sat Apr 9 08:33:55 2011 -0700
Improve lsh's handling of -l user option w/cd.
commit f3504138141f8332498ce3298b6c10335b8fdd28
Author: Wayne Davison way...@samba.org
Date: Sun Apr 3 18:02:45 2011 -0700
Move var declaration for older C compilers.
---
Summary of changes:
flist.c|3 ++-
rsyncd.conf.yo |6 ++
support/lsh| 14 ++
3 files changed, 14 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/flist.c b/flist.c
index 7102b5b..9e5bdd0 100644
--- a/flist.c
+++ b/flist.c
@@ -1646,11 +1646,12 @@ static void send_directory(int f, struct file_list
*flist, char *fbuf, int len,
remainder = 0;
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
+ unsigned name_len;
char *dname = d_name(di);
if (dname[0] == '.' (dname[1] == '\0'
|| (dname[1] == '.' dname[2] == '\0')))
continue;
- unsigned name_len = strlcpy(p, dname, remainder);
+ name_len = strlcpy(p, dname, remainder);
if (name_len = remainder) {
char save = fbuf[len];
fbuf[len] = '\0';
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 9e1926a..0f5215c 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -127,6 +127,12 @@ dit(bf(path)) This parameter specifies the directory in
the daemon's
filesystem to make available in this module. You must specify this parameter
for each module in tt(rsyncd.conf).
+It is fine if the path includes internal spaces -- they will be retained
+verbatim (which means that you shouldn't try to escape them). If your final
+directory has a trailing space (and this is somehow not something you wish to
+fix), append a trailing slash to the path to avoid losing the trailing
+whitespace.
+
dit(bf(use chroot)) If use chroot is true, the rsync daemon will chroot
to the path before starting the file transfer with the client. This has
the advantage of extra protection against possible implementation security
diff --git a/support/lsh b/support/lsh
index 65488dc..8ccc5a2 100755
--- a/support/lsh
+++ b/support/lsh
@@ -7,7 +7,6 @@
# command.
user=''
-prefix=''
do_cd=y # Default path is user's home dir, just like ssh.
while : ; do
@@ -22,14 +21,13 @@ while : ; do
done
if [ $user ]; then
-prefix=sudo -H -u '$user'
+prefix=''
if [ $do_cd = y ]; then
home=`perl -e print((getpwnam('$user'))[7])`
- # Yeah, this may fail, but attempts to get sudo to cd are harder.
- cd $home
+ prefix=cd '$home' ;
fi
-elif [ $do_cd = y ]; then
-cd
+sudo -H -u $user sh -c $prefix $*
+else
+[ $do_cd = y ] cd
+eval ${@}
fi
-
-eval $prefix ${@}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 2d07fa6 Mention latest fix. from 33e37a4 Make daemon-exclude errors more error-like. Fixes bug 7765. ;a=shortlog;h=b3.0.x - Log - commit 2d07fa6350c6deb0122a1bb965fb64f2f6282eaf Author: Wayne Davison way...@samba.org Date: Wed Jun 22 07:58:23 2011 -0700 Mention latest fix. --- Summary of changes: NEWS |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 28224a1..234ef56 100644 --- a/NEWS +++ b/NEWS @@ -6,7 +6,7 @@ Changes since 3.0.8: - Fix a crash bug in checksum scanning when --inplace is used. -- Fix preservation of system xattrs (e.g. selinux) on Linux. +- Fix preservation of a symlink's system xattrs (e.g. selinux) on Linux. - Fix a bug with the modifying of unwritable directories. @@ -14,4 +14,6 @@ Changes since 3.0.8: - Fix the updating of the curr_dir buffer to avoid a duplicate slash. +- Make daemon-excluded file errors more error-like. + - Fix some issues with the post-processing of the man pages. -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 93bdc64 Preparing for release of 3.0.9pre1
from 2d07fa6 Mention latest fix.
;a=shortlog;h=b3.0.x
- Log -
commit 93bdc6478e8d8a392b318f3986f9799ac3203d0e
Author: Wayne Davison way...@samba.org
Date: Wed Jun 22 08:00:35 2011 -0700
Preparing for release of 3.0.9pre1
---
Summary of changes:
packaging/lsb/rsync.spec | 12 ++--
rsync.yo |4 ++--
rsyncd.conf.yo |4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index 35febab..0171911 100644
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,9 +1,9 @@
Summary: A fast, versatile, remote (and local) file-copying tool
Name: rsync
-Version: 3.0.8
-%define fullversion %{version}
-Release: 1
-%define srcdir src
+Version: 3.0.9
+%define fullversion %{version}pre1
+Release: 0.1.pre1
+%define srcdir src-previews
Group: Applications/Internet
Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
#Source1:
http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-patches-%{fullversion}.tar.gz
@@ -66,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/rsyncd.conf.5*
%changelog
-* Sat Mar 26 2011 Wayne Davison way...@samba.org
-Released 3.0.8.
+* Wed Jun 22 2011 Wayne Davison way...@samba.org
+Released 3.0.9pre1.
* Fri Mar 21 2008 Wayne Davison way...@samba.org
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.yo b/rsync.yo
index 2b32232..d2a16fd 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsync)(1)(26 Mar 2011)()()
+manpage(rsync)(1)(22 Jun 2011)()()
manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
manpagesynopsis()
@@ -2996,7 +2996,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.8 of rsync.
+This man page is current for version 3.0.9pre1 of rsync.
manpagesection(INTERNAL OPTIONS)
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index b749e09..9e1926a 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsyncd.conf)(5)(26 Mar 2011)()()
+manpage(rsyncd.conf)(5)(22 Jun 2011)()()
manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
manpagesynopsis()
@@ -700,7 +700,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.8 of rsync.
+This man page is current for version 3.0.9pre1 of rsync.
manpagesection(CREDITS)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 5782ac0 Prepare for 3.0.9pre1 release. via fc41c32 Mention coming Solaris support. from 365124a Don't force \(em in the manpages. Fixes bug 7941. ;a=shortlog;h=b3.0.x - Log - commit 5782ac04d7dfade1cb751ab6deaeea60b3d0f15b Author: Wayne Davison way...@samba.org Date: Sat Jun 18 10:31:30 2011 -0700 Prepare for 3.0.9pre1 release. commit fc41c32159e51c53a24aada899a3d04cf3b9f054 Author: Wayne Davison way...@samba.org Date: Sat Jun 18 10:22:24 2011 -0700 Mention coming Solaris support. --- Summary of changes: NEWS | 137 +++ OLDNEWS | 142 ++ configure.ac |5 +- 3 files changed, 153 insertions(+), 131 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 40b7019..28224a1 100644 --- a/NEWS +++ b/NEWS @@ -1,138 +1,17 @@ -NEWS for rsync 3.0.8 (26 Mar 2011) +NEWS for rsync 3.0.9 (UNRELEASED) Protocol: 30 (unchanged) -Changes since 3.0.7: +Changes since 3.0.8: BUG FIXES: -- Fixed two buffer-overflow issues: one where a directory path that is - exactly MAXPATHLEN was not handled correctly, and one handling a - --backup-dir that is extra extra large. +- Fix a crash bug in checksum scanning when --inplace is used. -- Fixed a data-corruption issue when preserving hard-links without - preserving file ownership, and doing deletions either before or during - the transfer (CVE-2011-1097). This fixes some assert errors in the - hard-linking code, and some potential failed checksums (via -c) that - should have matched. +- Fix preservation of system xattrs (e.g. selinux) on Linux. -- Fixed a potential crash when an rsync daemon has a filter/exclude list - and the transfer is using ACLs or xattrs. +- Fix a bug with the modifying of unwritable directories. -- Fixed a hang if a really large file is being processed by an rsync that - can't handle 64-bit numbers. Rsync will now complain about the file - being too big and skip it. +- Fix --fake-super's interaction with --link-dest same-file comparisons. -- For devices and special files, we now avoid gathering useless ACL and/or - xattr information for files that aren't being copied. (The un-copied - files are still put into the file list, but there's no need to gather - data that is not going to be used.) This ensures that if the user uses - --no-D, that rsync can't possibly complain about being unable to gather - extended information from special files that are in the file list (but - not in the transfer). +- Fix the updating of the curr_dir buffer to avoid a duplicate slash. -- Properly handle requesting remote filenames that start with a dash. This - avoids a potential error where a filename could be interpreted as a - (usually invalid) option. - -- Fixed a bug in the comparing of upper-case letters in file suffixes for - --skip-compress. - -- If an rsync daemon has a module configured without a path setting, rsync - will now disallow access to that module. - -- If the destination arg is an empty string, it will be treated as a - reference to the current directory (as 2.x used to do). - -- If rsync was compiled with a newer time-setting function (such as - lutimes), rsync will fall-back to an older function (such as utimes) on a - system where the newer function is not around. This helps to make the - rsync binary more portable in mixed-OS-release situations. - -- Fixed a batch-file writing bug that would not write out the full set of - compatibility flags that the transfer was using. This fixes a potential - protocol problem for a batch file that contains a sender-side I/O error: - it would have been sent in a way that the batch-reader wasn't expecting. - -- Some improvements to the hard-linking code to ensure that device-number - hashing is working right, and to supply more information if the hard-link - code fails. - -- The --inplace code was improved to not search for an impossible checksum - position. The quadruple-verbose chunk[N] message will now mention when - an inplace chunk was handled by a seek rather than a read+write. - -- Improved ACL mask handling, e.g. for Solaris. - -- Fixed a bug that prevented --numeric-ids from disabling the translation - of user/group IDs for ACLs. - -- Fixed an issue where an xattr and/or ACL transfer that used an alt-dest - option (e.g. --link-dest) could output an error trying to itemize the - changes against the alt-dest directory's xattr/ACL info but was instead - trying to access the
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 33e37a4 Make daemon-exclude errors more error-like. Fixes bug 7765.
from 5782ac0 Prepare for 3.0.9pre1 release.
;a=shortlog;h=b3.0.x
- Log -
commit 33e37a49baf7a3d65025c10a1899741d201a3f2c
Author: Wayne Davison way...@samba.org
Date: Sat Jun 18 12:44:26 2011 -0700
Make daemon-exclude errors more error-like.
Fixes bug 7765.
---
Summary of changes:
generator.c |2 +-
main.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index 88a762a..d7e1ba8 100644
--- a/generator.c
+++ b/generator.c
@@ -1355,7 +1355,7 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
handle_skipped_hlink(file, itemizing, code,
f_out);
#endif
rprintf(FERROR_XFER,
- skipping daemon-excluded %s \%s\\n,
+ ERROR: daemon refused to receive %s \%s\\n,
is_dir ? directory : file, fname);
if (is_dir)
goto skipping_dir_contents;
diff --git a/main.c b/main.c
index b6cc6bd..e23e570 100644
--- a/main.c
+++ b/main.c
@@ -526,7 +526,7 @@ static char *get_local_name(struct file_list *flist, char
*dest_path)
if ((*dest_path != '.' || dest_path[1] != '\0')
(check_filter(daemon_filter_list, FLOG, dest_path, 0) 0
|| check_filter(daemon_filter_list, FLOG, dest_path, 1)
0)) {
- rprintf(FERROR, skipping daemon-excluded destination
\%s\\n,
+ rprintf(FERROR, ERROR: daemon has excluded destination
\%s\\n,
dest_path);
exit_cleanup(RERR_FILESELECT);
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via dbf68ca Linux needs symlink xattrs. Fixes bug 8201. from ba35ba0 Fix unwritable directory issue due to misordered chmod call. ;a=shortlog;h=b3.0.x - Log - commit dbf68ca4c11771f57a01040e805bcd5549110221 Author: Wayne Davison way...@samba.org Date: Sat Jun 4 09:46:06 2011 -0700 Linux needs symlink xattrs. Fixes bug 8201. --- Summary of changes: configure.ac |4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index ff21b3a..7b29040 100644 --- a/configure.ac +++ b/configure.ac @@ -966,7 +966,6 @@ else AC_MSG_RESULT(Using Linux xattrs) AC_DEFINE(HAVE_LINUX_XATTRS, 1, [True if you have Linux xattrs]) AC_DEFINE(SUPPORT_XATTRS, 1) - AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs]) ;; darwin*) AC_MSG_RESULT(Using OS X xattrs) @@ -980,6 +979,9 @@ else AC_DEFINE(HAVE_FREEBSD_XATTRS, 1, [True if you have FreeBSD xattrs]) AC_DEFINE(SUPPORT_XATTRS, 1) ;; +for_some_future_os_need) + AC_DEFINE(NO_SYMLINK_XATTRS, 1, [True if symlinks do not support xattrs]) + ;; *) if test x$enable_xattr_support = xyes; then AC_MSG_ERROR(Failed to find extended attribute support) -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 365124a Don't force \(em in the manpages. Fixes bug 7941.
from dbf68ca Linux needs symlink xattrs. Fixes bug 8201.
;a=shortlog;h=b3.0.x
- Log -
commit 365124a2144e7bebfe9857bbb070953cac9798b1
Author: Wayne Davison way...@samba.org
Date: Sat Jun 4 12:53:10 2011 -0700
Don't force \(em in the manpages. Fixes bug 7941.
---
Summary of changes:
tweak_manpage | 15 +++
1 files changed, 3 insertions(+), 12 deletions(-)
Changeset truncated at 500 lines:
diff --git a/tweak_manpage b/tweak_manpage
index f10d2a0..4c55c51 100755
--- a/tweak_manpage
+++ b/tweak_manpage
@@ -1,19 +1,10 @@
#!/usr/bin/perl -i -p
-# Make some hyphens unbreakable.
-s{(--\w[-\w]+)}{ $x = $1; $x =~ s/-/\\-/g; $x }eg;
-s/(?!\\)-(['\d*])/\\-$1/g;
-s#(['(= /,])-(?!-)#$1\\-#g;
-s/(\\fB)-/$1\\-/g;
-s/(\[\w)-(\w\])/$1\\-$2/g;
-s{(\\f\(CW.*?\\fP)}{ $x = $1; $x =~ s/(?!\\)-/\\-/g; $x }eg;
-s/(\.\w+)-/$1\\-/g;
+use strict;
+use warnings;
# We only need to use \' or \. at the start of a line.
-s/(?=.)\\\(['.])/$1$2/g;
-
-# Use an em-dash where appropriate.
-s/ \\?-{1,2} / \\(em /g;
+s/(?=.)\\\(['.])/$1/g;
# Some quotes turn into open/close quotes.
s/'(.)'/\\(oq$1\\(cq/g;
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via ba35ba0 Fix unwritable directory issue due to misordered chmod call.
via 0b51926 Expand NO_ENTRY items from fake-super ACLs in
get_rsync_acl().
from 3ef38b0 Avoid adding a slash to path '/'.
;a=shortlog;h=b3.0.x
- Log -
commit ba35ba06c9964d67fd7712f1b103e6d527f30c46
Author: Wayne Davison way...@samba.org
Date: Mon May 30 08:24:27 2011 -0700
Fix unwritable directory issue due to misordered chmod call.
commit 0b519262c60f8decef113b86aed2599253d29ce1
Author: Wayne Davison way...@samba.org
Date: Wed May 25 08:59:47 2011 -0700
Expand NO_ENTRY items from fake-super ACLs in get_rsync_acl().
---
Summary of changes:
acls.c |6 ++
generator.c | 16
2 files changed, 14 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/acls.c b/acls.c
index e6f6088..c72784c 100644
--- a/acls.c
+++ b/acls.c
@@ -495,9 +495,15 @@ static int get_rsync_acl(const char *fname, rsync_acl
*racl,
}
racl-user_obj = IVAL(buf, 0);
+ if (racl-user_obj == NO_ENTRY)
+ racl-user_obj = (mode 6) 7;
racl-group_obj = IVAL(buf, 4);
+ if (racl-group_obj == NO_ENTRY)
+ racl-group_obj = (mode 3) 7;
racl-mask_obj = IVAL(buf, 8);
racl-other_obj = IVAL(buf, 12);
+ if (racl-other_obj == NO_ENTRY)
+ racl-other_obj = mode 7;
if (cnt) {
char *bp = buf + 4*4;
diff --git a/generator.c b/generator.c
index 4f74597..88a762a 100644
--- a/generator.c
+++ b/generator.c
@@ -1523,6 +1523,14 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
}
}
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs statret == 1)
+ copy_xattrs(fnamecmpbuf, fname);
+#endif
+ if (set_file_attrs(fname, file, real_ret ? NULL : real_sx,
NULL, 0)
+verbose code != FNONE f_out != -1)
+ rprintf(code, %s/\n, fname);
+
/* We need to ensure that the dirs in the transfer have writable
* permissions during the time we are putting files within them.
* This is then fixed after the transfer is done. */
@@ -1538,14 +1546,6 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
}
#endif
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs statret == 1)
- copy_xattrs(fnamecmpbuf, fname);
-#endif
- if (set_file_attrs(fname, file, real_ret ? NULL : real_sx,
NULL, 0)
-verbose code != FNONE f_out != -1)
- rprintf(code, %s/\n, fname);
-
if (real_ret != 0 one_file_system)
real_sx.st.st_dev = filesystem_dev;
if (inc_recurse) {
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 3ef38b0 Avoid adding a slash to path '/'.
via 5a1d092 Fix a potential crash when trying to find a better block
match.
from 1ddcdaf Preparing for release of 3.0.8
;a=shortlog;h=b3.0.x
- Log -
commit 3ef38b0d1b5efcd857b9e2f7608f288bd0439785
Author: Wayne Davison way...@samba.org
Date: Fri Apr 22 15:51:55 2011 -0700
Avoid adding a slash to path '/'.
commit 5a1d092ae1f184ab5349728587405bacafcd1aaf
Author: Wayne Davison way...@samba.org
Date: Fri Apr 22 11:27:16 2011 -0700
Fix a potential crash when trying to find a better block match.
---
Summary of changes:
match.c |2 +-
util.c |5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/match.c b/match.c
index 658d786..154099d 100644
--- a/match.c
+++ b/match.c
@@ -238,7 +238,7 @@ static void hash_search(int f,struct sum_struct *s,
aligned_offset += s-blength;
aligned_i++;
}
- if (offset == aligned_offset) {
+ if (offset == aligned_offset aligned_i
s-count) {
if (i != aligned_i) {
if (sum !=
s-sums[aligned_i].sum1
|| l != s-sums[aligned_i].len
diff --git a/util.c b/util.c
index a694fde..2991fd2 100644
--- a/util.c
+++ b/util.c
@@ -1024,8 +1024,9 @@ int change_dir(const char *dir, int set_path_only)
errno = ENAMETOOLONG;
return 0;
}
- curr_dir[curr_dir_len] = '/';
- memcpy(curr_dir + curr_dir_len + 1, dir, len + 1);
+ if (!(curr_dir_len curr_dir[curr_dir_len-1] == '/'))
+ curr_dir[curr_dir_len++] = '/';
+ memcpy(curr_dir + curr_dir_len, dir, len + 1);
if (!set_path_only chdir(curr_dir)) {
curr_dir[curr_dir_len] = '\0';
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via a7271fb Avoid re-setting xattrs on a hard-linked file w/the same
xattrs. Improved the xattrs testing to include hard-linking.
from 2770361 Mention the latest changes.
;a=shortlog;h=b3.0.x
- Log -
commit a7271fb30f37490618fb03ff83461fd24acab20a
Author: Wayne Davison way...@samba.org
Date: Sat Mar 26 09:15:26 2011 -0700
Avoid re-setting xattrs on a hard-linked file w/the same xattrs.
Improved the xattrs testing to include hard-linking.
---
Summary of changes:
.gitignore |1 +
Makefile.in |5 -
NEWS |2 ++
receiver.c |5 +++--
testsuite/hardlinks.test |2 +-
testsuite/xattrs.test| 44 ++--
6 files changed, 49 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.gitignore b/.gitignore
index 76693bb..1fea441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,5 @@ config.status
/support/savetransfer
/testsuite/chown-fake.test
/testsuite/devices-fake.test
+/testsuite/xattrs-hlink.test
/patches
diff --git a/Makefile.in b/Makefile.in
index 38986da..6f753ac 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,7 +48,7 @@ TLS_OBJ = tls.o syscall.o lib/compat.o lib/snprintf.o
lib/permstring.o lib/sysxa
CHECK_PROGS = rsync$(EXEEXT) tls$(EXEEXT) getgroups$(EXEEXT) getfsdev$(EXEEXT)
\
trimslash$(EXEEXT) t_unsafe$(EXEEXT) wildtest$(EXEEXT)
-CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test
+CHECK_SYMLINKS = testsuite/chown-fake.test testsuite/devices-fake.test
testsuite/xattrs-hlink.test
# Objects for CHECK_PROGS to clean
CHECK_OBJS=tls.o getgroups.o getfsdev.o t_stub.o t_unsafe.o trimslash.o
wildtest.o
@@ -249,6 +249,9 @@ testsuite/chown-fake.test:
testsuite/devices-fake.test:
ln -s devices.test $(srcdir)/testsuite/devices-fake.test
+testsuite/xattrs-hlink.test:
+ ln -s xattrs.test $(srcdir)/testsuite/xattrs-hlink.test
+
# This does *not* depend on building or installing: you can use it to
# check a version installed from a binary or some other source tree,
# if you want.
diff --git a/NEWS b/NEWS
index 625c27b..1822614 100644
--- a/NEWS
+++ b/NEWS
@@ -83,6 +83,8 @@ Changes since 3.0.7:
- Fixed a bug setting xattrs on new files that aren't user writable.
+- Avoid re-setting xattrs on a hard-linked file w/the same xattrs.
+
- Fixed a bug with --fake-super when copying files and dirs that aren't
user writable.
diff --git a/receiver.c b/receiver.c
index fc7ab57..d90fa25 100644
--- a/receiver.c
+++ b/receiver.c
@@ -503,14 +503,15 @@ int recv_files(int f_in, char *local_name)
rprintf(FINFO, recv_files(%s)\n, fname);
#ifdef SUPPORT_XATTRS
- if (iflags ITEM_REPORT_XATTR do_xfers)
+ if (preserve_xattrs iflags ITEM_REPORT_XATTR do_xfers)
recv_xattr_request(file, f_in);
#endif
if (!(iflags ITEM_TRANSFER)) {
maybe_log_item(file, iflags, itemizing, xname);
#ifdef SUPPORT_XATTRS
- if (preserve_xattrs iflags ITEM_REPORT_XATTR
do_xfers)
+ if (preserve_xattrs iflags ITEM_REPORT_XATTR
do_xfers
+ !BITS_SET(iflags,
ITEM_XNAME_FOLLOWS|ITEM_LOCAL_CHANGE))
set_file_attrs(fname, file, NULL, fname, 0);
#endif
continue;
diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index 1737b35..a0db2d0 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -28,7 +28,7 @@ name2=$fromdir/name2
name3=$fromdir/name3
name4=$fromdir/name4
echo This is the file $name1
-ln $name1 $name2 || fail Can't create hardlink
+ln $name1 $name2 || test_skipped Can't create hardlink
ln $name2 $name3 || fail Can't create hardlink
cp $name2 $name4 || fail Can't copy file
cat $srcdir/*.c $fromdir/text
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index 97056b7..50e262b 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -6,6 +6,7 @@
# Test that rsync handles basic xattr preservation.
. $srcdir/testsuite/rsync.fns
+lnkdir=$tmpdir/lnk
$RSYNC --version | grep , xattrs /dev/null || test_skipped Rsync is
configured without xattr support
@@ -38,7 +39,7 @@ case `xattr 21` in
;;
esac
-makepath $fromdir/foo/bar
+makepath $lnkdir $fromdir/foo/bar
echo now $fromdir/file0
echo something $fromdir/file1
echo else $fromdir/file2
@@ -73,32 +74,60 @@ xset user.dir1 'need to test directory xattrs too' foo
xset user.dir2 'another xattr' foo
xset user.dir3 'this is one last one for the moment' foo
+xset user.dir4 'another dir test' foo/bar
+xset user.dir5 'one last one' foo/bar
+
xset user.foo 'new foo'
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 959bd70 Tweak dir xattrs after the writability fudging.
from a7271fb Avoid re-setting xattrs on a hard-linked file w/the same
xattrs. Improved the xattrs testing to include hard-linking.
;a=shortlog;h=b3.0.x
- Log -
commit 959bd708209d6cbb9c9c7aa34de7b8f9423da0de
Author: Wayne Davison way...@samba.org
Date: Sat Mar 26 10:17:14 2011 -0700
Tweak dir xattrs after the writability fudging.
---
Summary of changes:
generator.c | 15 ---
1 files changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index b914ddf..4f74597 100644
--- a/generator.c
+++ b/generator.c
@@ -1522,13 +1522,6 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
goto cleanup;
}
}
-#ifdef SUPPORT_XATTRS
- if (preserve_xattrs statret == 1)
- copy_xattrs(fnamecmpbuf, fname);
-#endif
- if (set_file_attrs(fname, file, real_ret ? NULL : real_sx,
NULL, 0)
-verbose code != FNONE f_out != -1)
- rprintf(code, %s/\n, fname);
/* We need to ensure that the dirs in the transfer have writable
* permissions during the time we are putting files within them.
@@ -1545,6 +1538,14 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
}
#endif
+#ifdef SUPPORT_XATTRS
+ if (preserve_xattrs statret == 1)
+ copy_xattrs(fnamecmpbuf, fname);
+#endif
+ if (set_file_attrs(fname, file, real_ret ? NULL : real_sx,
NULL, 0)
+verbose code != FNONE f_out != -1)
+ rprintf(code, %s/\n, fname);
+
if (real_ret != 0 one_file_system)
real_sx.st.st_dev = filesystem_dev;
if (inc_recurse) {
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via bc6363f Enhance the -liconv check for OS X. Fixes bug 8018. from e71130f Don't send user/group names for ACLs with --numeric-ids. Fixes bug 8020. ;a=shortlog;h=b3.0.x - Log - commit bc6363f9ab0ece866755eef863bb55f98517f2c8 Author: Wayne Davison way...@samba.org Date: Sun Mar 20 19:31:58 2011 -0700 Enhance the -liconv check for OS X. Fixes bug 8018. --- Summary of changes: configure.ac |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index 19bfa63..e5c4f29 100644 --- a/configure.ac +++ b/configure.ac @@ -428,8 +428,10 @@ fi AC_SEARCH_LIBS(inet_ntop, resolv) -# Solaris and HP-UX weirdness: -# Search for libiconv_open (not iconv_open) to discover if -liconv is needed! +# For OS X, Solaris, HP-UX, etc.: figure out if -liconv is needed. We'll +# accept either iconv_open or libiconv_open, since some include files map +# the former to the latter. +AC_SEARCH_LIBS(iconv_open, iconv) AC_SEARCH_LIBS(libiconv_open, iconv) AC_MSG_CHECKING([for iconv declaration]) -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 2770361 Mention the latest changes. from bc6363f Enhance the -liconv check for OS X. Fixes bug 8018. ;a=shortlog;h=b3.0.x - Log - commit 277036153a966b6e312693f502ab867f67074929 Author: Wayne Davison way...@samba.org Date: Sun Mar 20 19:45:23 2011 -0700 Mention the latest changes. --- Summary of changes: NEWS |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 89b4c5b..625c27b 100644 --- a/NEWS +++ b/NEWS @@ -61,6 +61,9 @@ Changes since 3.0.7: - Improved ACL mask handling, e.g. for Solaris. +- Fixed a bug that prevented --numeric-ids from disabling the translation + of user/group IDs for ACLs. + - Fixed an issue where an xattr and/or ACL transfer that used an alt-dest option (e.g. --link-dest) could output an error trying to itemize the changes against the alt-dest directory's xattr/ACL info but was instead @@ -126,3 +129,7 @@ Changes since 3.0.7: - Updated the helper scripts in the packaging subdirectory. - Renamed configure.in to configure.ac. + +- Fixed configure's checking for iconv routines for newer OS X versions. + +- Fixed the testsuite/xattrs.test script on OS X. -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via e71130f Don't send user/group names for ACLs with --numeric-ids.
Fixes bug 8020.
via 38c9f1b Get rid of an unused extern.
from 779663f Fix xattrs test on OS X.
;a=shortlog;h=b3.0.x
- Log -
commit e71130fd7739562cd190a92d3f8bcbda02168892
Author: Wayne Davison way...@samba.org
Date: Fri Mar 18 14:42:28 2011 -0700
Don't send user/group names for ACLs with --numeric-ids.
Fixes bug 8020.
commit 38c9f1becf7b19202ef942919aee38603e31e33b
Author: Wayne Davison way...@samba.org
Date: Thu Mar 17 11:25:12 2011 -0700
Get rid of an unused extern.
---
Summary of changes:
acls.c |4 ++--
util.c |1 -
2 files changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/acls.c b/acls.c
index 9fac3cd..e6f6088 100644
--- a/acls.c
+++ b/acls.c
@@ -589,9 +589,9 @@ static void send_ida_entries(int f, const ida_entries *idal)
const char *name;
if (ida-access NAME_IS_USER) {
xbits |= XFLAG_NAME_IS_USER;
- name = add_uid(ida-id);
+ name = numeric_ids ? NULL : add_uid(ida-id);
} else
- name = add_gid(ida-id);
+ name = numeric_ids ? NULL : add_gid(ida-id);
write_varint(f, ida-id);
if (inc_recurse name) {
int len = strlen(name);
diff --git a/util.c b/util.c
index 7f207a3..a694fde 100644
--- a/util.c
+++ b/util.c
@@ -24,7 +24,6 @@
#include ifuncs.h
extern int verbose;
-extern int dry_run;
extern int module_id;
extern int modify_window;
extern int relative_paths;
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 779663f Fix xattrs test on OS X.
from 9562cc8 A few minor NEWS improvements.
;a=shortlog;h=b3.0.x
- Log -
commit 779663fc6cabf042cfaa6869fd0b10b2d21f5b85
Author: Wayne Davison way...@samba.org
Date: Sun Mar 13 20:42:58 2011 -0700
Fix xattrs test on OS X.
---
Summary of changes:
testsuite/rsync.fns |1 +
testsuite/xattrs.test |8 +---
2 files changed, 6 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 903bd6c..fbca180 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -27,6 +27,7 @@ chkdir=$tmpdir/chk
all_plus='+'
allspace=' '
dots='.' # trailing dots after changes
+tab_ch=' ' # a single tab character
# Berkley's nice.
PATH=$PATH:/usr/ucb
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index b61f561..97056b7 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -18,8 +18,9 @@ case `xattr 21` in
xattr -s $xnam $xval ${@}
}
xls() {
- xattr -l ${@}
+ xattr -l ${@} | sed s/^[ $tab_ch]*//
}
+RSYNC_PREFIX='rsync'
RUSR='rsync.nonuser'
;;
*)
@@ -32,6 +33,7 @@ case `xattr 21` in
xls() {
getfattr -d ${@}
}
+RSYNC_PREFIX='user.rsync'
RUSR='user.rsync'
;;
esac
@@ -125,8 +127,8 @@ cd $chkdir
chmod go-rwx . $dirs $files
xset user.nice 'this is nice, but different' file1
-xset user.rsync.%stat 4 0,0 $uid_gid $dirs
-xset user.rsync.%stat 10 0,0 $uid_gid $files
+xset $RSYNC_PREFIX.%stat 4 0,0 $uid_gid $dirs
+xset $RSYNC_PREFIX.%stat 10 0,0 $uid_gid $files
xls $dirs $files $scratchdir/xattrs.txt
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 9562cc8 A few minor NEWS improvements. from a945aa1 Clarify what extraneous hard link are. ;a=shortlog;h=b3.0.x - Log - commit 9562cc892556878a27843db4773386a55bd6aab5 Author: Wayne Davison way...@samba.org Date: Sat Feb 26 08:10:27 2011 -0800 A few minor NEWS improvements. --- Summary of changes: NEWS | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 4c87c82..89b4c5b 100644 --- a/NEWS +++ b/NEWS @@ -59,9 +59,6 @@ Changes since 3.0.7: position. The quadruple-verbose chunk[N] message will now mention when an inplace chunk was handled by a seek rather than a read+write. -- If we fail to connect to an rsync daemon, report all the connection - errors (e.g. IPv4 IPv6), not just the last one. - - Improved ACL mask handling, e.g. for Solaris. - Fixed an issue where an xattr and/or ACL transfer that used an alt-dest @@ -103,17 +100,18 @@ Changes since 3.0.7: - Generate a transfer error if we try to call chown with a -1 for a uid or a gid (which is not settable). -- Fixed a forceful delete of a file with --one-file-system. +- Fixed the working of --force when used with --one-file-system. - Fix the popt arg parsing so that an option that doesn't take an arg will - reject an attempt to supply one. + reject an attempt to supply one (can configure --with-included-popt if + your system's popt library doesn't yet have this fix). -- A couple minor option tweaks to support/rrsync script, and also some +- A couple minor option tweaks to the support/rrsync script, and also some regex changes that make vim highlighting happier. - Fixed some issues in the support/mnt-excl script. -- A few manpage improvements. +- Various manpage improvements. ENHANCEMENTS: -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via a945aa1 Clarify what extraneous hard link are. from 2a1d251 Get rid of obsolete tempfs warning. ;a=shortlog;h=b3.0.x - Log - commit a945aa19d94f4cc047cd9cf38405c499653d28db Author: Wayne Davison way...@samba.org Date: Wed Feb 23 07:19:23 2011 -0800 Clarify what extraneous hard link are. --- Summary of changes: rsync.yo |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/rsync.yo b/rsync.yo index 5f88586..f4cb2ba 100644 --- a/rsync.yo +++ b/rsync.yo @@ -875,7 +875,8 @@ destination exactly matches that on the source. Cases in which the destination may end up with extra hard links include the following: quote(itemization( - it() If the destination contains extraneous hard-linked files, rsync will not + it() If the destination contains extraneous hard-links (more linking than + what is present in the source file list), the copying algorithm will not break them explicitly. However, if one or more of the paths have content differences, the normal file-update process will break those extra links (unless you are using the bf(--inplace) option). -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 07b5c77 Fix test 5's failure message. from 8b7f20b Mention latest changes. ;a=shortlog;h=b3.0.x - Log - commit 07b5c770db603d1b173fc2835931fd9b1b069556 Author: Wayne Davison way...@samba.org Date: Tue Feb 22 07:41:02 2011 -0800 Fix test 5's failure message. --- Summary of changes: testsuite/devices.test |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/testsuite/devices.test b/testsuite/devices.test index 1e7b776..a6474dc 100644 --- a/testsuite/devices.test +++ b/testsuite/devices.test @@ -116,8 +116,8 @@ cD$all_plus char2 cD$all_plus char3 cS$all_plus fifo EOT -if test ! -r $fromdir/block2.5; then -sed -e '/block2\.5/d' $chkfile $chkfile.new +if test ! -b $fromdir/block2.5; then +grep -v block2.5 $chkfile $chkfile.new mv $chkfile.new $chkfile fi diff $diffopt $chkfile $outfile || test_fail test 4 failed @@ -143,7 +143,7 @@ hD$allspace char2 hD$allspace char3 hS$allspace fifo EOT -diff $diffopt $chkfile $outfile || test_fail test 4 failed +diff $diffopt $chkfile $outfile || test_fail test 5 failed fi # The script would have aborted on error, so getting here means we've won. -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via aa3640c Fix issue with devices-fake test. from 07b5c77 Fix test 5's failure message. ;a=shortlog;h=b3.0.x - Log - commit aa3640c09b37954fb86f7aab95085bc60ad254cc Author: Wayne Davison way...@samba.org Date: Tue Feb 22 07:59:08 2011 -0800 Fix issue with devices-fake test. --- Summary of changes: testsuite/devices.test |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/testsuite/devices.test b/testsuite/devices.test index a6474dc..5981e03 100644 --- a/testsuite/devices.test +++ b/testsuite/devices.test @@ -116,7 +116,7 @@ cD$all_plus char2 cD$all_plus char3 cS$all_plus fifo EOT -if test ! -b $fromdir/block2.5; then +if test ! -r $fromdir/block2.5; then grep -v block2.5 $chkfile $chkfile.new mv $chkfile.new $chkfile fi @@ -128,7 +128,7 @@ echo ( cd $todir rsync_ls_lR . ) $tmpdir/ls-to diff $diffopt $tmpdir/ls-from $tmpdir/ls-to -if test -b $fromdir/block2.5; then +if test -r $fromdir/block2.5; then set -x $RSYNC -aii --link-dest=$todir $fromdir/ $chkdir/ \ | tee $outfile -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via b178eb0 Allow a failure of EINVAL to mean no ACLs are available.
(If our POSIX types aren't valid, we can't handle the ACLs.)
via 3158b8d Fix --force with --one-file-system w/o --delete.
from aa3640c Fix issue with devices-fake test.
;a=shortlog;h=b3.0.x
- Log -
commit b178eb04d3406af1ec90641e1090caa7bbe831db
Author: Wayne Davison way...@samba.org
Date: Tue Feb 22 08:49:21 2011 -0800
Allow a failure of EINVAL to mean no ACLs are available.
(If our POSIX types aren't valid, we can't handle the ACLs.)
commit 3158b8df6c193c1e304f3244b46b93752445744b
Author: Wayne Davison way...@samba.org
Date: Tue Feb 22 08:19:50 2011 -0800
Fix --force with --one-file-system w/o --delete.
---
Summary of changes:
acls.c|3 +++
lib/sysacls.c |5 +
main.c|2 ++
3 files changed, 10 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/acls.c b/acls.c
index 87b6c80..9fac3cd 100644
--- a/acls.c
+++ b/acls.c
@@ -1101,6 +1101,9 @@ int default_perms_for_dir(const char *dir)
if (sacl == NULL) {
/* Couldn't get an ACL. Darn. */
switch (errno) {
+ case EINVAL:
+ /* If SMB_ACL_TYPE_DEFAULT isn't valid, then the ACLs
must be non-POSIX. */
+ break;
#ifdef ENOTSUP
case ENOTSUP:
#endif
diff --git a/lib/sysacls.c b/lib/sysacls.c
index 19d4d7a..52314bc 100644
--- a/lib/sysacls.c
+++ b/lib/sysacls.c
@@ -2781,6 +2781,11 @@ int no_acl_syscall_error(int err)
return 1;
}
#endif
+ if (err == EINVAL) {
+ /* If the type of SMB_ACL_TYPE_ACCESS or SMB_ACL_TYPE_DEFAULT
+* isn't valid, then the ACLs must be non-POSIX. */
+ return 1;
+ }
return 0;
}
diff --git a/main.c b/main.c
index 85e38f3..b6cc6bd 100644
--- a/main.c
+++ b/main.c
@@ -64,6 +64,7 @@ extern int write_batch;
extern int batch_fd;
extern int filesfrom_fd;
extern int connect_timeout;
+extern dev_t filesystem_dev;
extern pid_t cleanup_child_pid;
extern unsigned int module_dirlen;
extern struct stats stats;
@@ -542,6 +543,7 @@ static char *get_local_name(struct file_list *flist, char
*dest_path)
full_fname(dest_path));
exit_cleanup(RERR_FILESELECT);
}
+ filesystem_dev = st.st_dev; /* ensures --force works
right w/-x */
return NULL;
}
if (file_total 1) {
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 72193c8 Some uid/gid fixes for (id_t)-1.
from b178eb0 Allow a failure of EINVAL to mean no ACLs are available.
(If our POSIX types aren't valid, we can't handle the ACLs.)
;a=shortlog;h=b3.0.x
- Log -
commit 72193c82a60ce52550c91d9f2596dedd3d16dde0
Author: Wayne Davison way...@samba.org
Date: Tue Feb 22 10:48:13 2011 -0800
Some uid/gid fixes for (id_t)-1.
The code now avoids any special internal meaning for gid -1. If chown()
is called with a uid or gid of -1, complain that the ID is not settable
and signal a transfer error.
---
Summary of changes:
rsync.c | 10 +++---
uidlist.c |8 +++-
2 files changed, 10 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/rsync.c b/rsync.c
index bb58fc9..143eb38 100644
--- a/rsync.c
+++ b/rsync.c
@@ -463,9 +463,9 @@ int set_file_attrs(const char *fname, struct file_struct
*file, stat_x *sxp,
}
}
if (am_root = 0) {
- if (do_lchown(fname,
- change_uid ? (uid_t)F_OWNER(file) : sxp-st.st_uid,
- change_gid ? (gid_t)F_GROUP(file) : sxp-st.st_gid)
!= 0) {
+ uid_t uid = change_uid ? (uid_t)F_OWNER(file) :
sxp-st.st_uid;
+ gid_t gid = change_gid ? (gid_t)F_GROUP(file) :
sxp-st.st_gid;
+ if (do_lchown(fname, uid, gid) != 0) {
/* We shouldn't have attempted to change uid
* or gid unless have the privilege. */
rsyserr(FERROR_XFER, errno, %s %s failed,
@@ -473,6 +473,10 @@ int set_file_attrs(const char *fname, struct file_struct
*file, stat_x *sxp,
full_fname(fname));
goto cleanup;
}
+ if (uid == (uid_t)-1 sxp-st.st_uid != (uid_t)-1)
+ rprintf(FERROR_XFER, uid 4294967295 (-1) is
impossible to set on %s\n, full_fname(fname));
+ if (gid == (gid_t)-1 sxp-st.st_gid != (gid_t)-1)
+ rprintf(FERROR_XFER, gid 4294967295 (-1) is
impossible to set on %s\n, full_fname(fname));
/* A lchown had been done, so we need to re-stat if
* the destination had the setuid or setgid bits set
* (due to the side effect of the chown call). */
diff --git a/uidlist.c b/uidlist.c
index dd26a55..e43ae5c 100644
--- a/uidlist.c
+++ b/uidlist.c
@@ -39,8 +39,6 @@ extern int numeric_ids;
# endif
#endif
-#define GID_NONE ((gid_t)-1)
-
struct idlist {
struct idlist *next;
const char *name;
@@ -103,12 +101,12 @@ static gid_t map_gid(gid_t id, const char *name)
static int is_in_group(gid_t gid)
{
#ifdef HAVE_GETGROUPS
- static gid_t last_in = GID_NONE, last_out;
- static int ngroups = -2;
+ static gid_t last_in;
+ static int ngroups = -2, last_out = -1;
static GETGROUPS_T *gidset;
int n;
- if (gid == last_in)
+ if (gid == last_in last_out = 0)
return last_out;
if (ngroups -1) {
gid_t mygid = MY_GID();
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 922895d Mention even more fixes. from 72193c8 Some uid/gid fixes for (id_t)-1. ;a=shortlog;h=b3.0.x - Log - commit 922895d9a38fc26542eab4b014b349b953c0ec75 Author: Wayne Davison way...@samba.org Date: Tue Feb 22 10:57:10 2011 -0800 Mention even more fixes. --- Summary of changes: NEWS |5 + 1 files changed, 5 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 17429d4..4c87c82 100644 --- a/NEWS +++ b/NEWS @@ -100,6 +100,11 @@ Changes since 3.0.7: that happened before the final error (e.g. an IPv6 protocol-not-supported error). +- Generate a transfer error if we try to call chown with a -1 for a uid or + a gid (which is not settable). + +- Fixed a forceful delete of a file with --one-file-system. + - Fix the popt arg parsing so that an option that doesn't take an arg will reject an attempt to supply one. -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 8750f64 Preparing for release of 3.0.8pre1
from 922895d Mention even more fixes.
;a=shortlog;h=b3.0.x
- Log -
commit 8750f64ec7893c263b51e538895af3092bce9f4c
Author: Wayne Davison way...@samba.org
Date: Tue Feb 22 11:03:42 2011 -0800
Preparing for release of 3.0.8pre1
---
Summary of changes:
configure.ac |2 +-
packaging/lsb/rsync.spec | 12 ++--
rsync.yo |4 ++--
rsyncd.conf.yo |4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/configure.ac b/configure.ac
index 5b18ea3..19bfa63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
AC_CONFIG_HEADER(config.h)
AC_PREREQ(2.59)
-RSYNC_VERSION=3.0.8dev
+RSYNC_VERSION=3.0.8pre1
AC_SUBST(RSYNC_VERSION)
AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])
diff --git a/packaging/lsb/rsync.spec b/packaging/lsb/rsync.spec
index 57bc7c0..aaca3cf 100644
--- a/packaging/lsb/rsync.spec
+++ b/packaging/lsb/rsync.spec
@@ -1,9 +1,9 @@
Summary: A fast, versatile, remote (and local) file-copying tool
Name: rsync
-Version: 3.0.7
-%define fullversion %{version}
-Release: 1
-%define srcdir src
+Version: 3.0.8
+%define fullversion %{version}pre1
+Release: 0.1.pre1
+%define srcdir src-previews
Group: Applications/Internet
Source0: http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-%{fullversion}.tar.gz
#Source1:
http://rsync.samba.org/ftp/rsync/%{srcdir}/rsync-patches-%{fullversion}.tar.gz
@@ -66,8 +66,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man5/rsyncd.conf.5*
%changelog
-* Thu Dec 31 2009 Wayne Davison way...@samba.org
-Released 3.0.7.
+* Tue Feb 22 2011 Wayne Davison way...@samba.org
+Released 3.0.8pre1.
* Fri Mar 21 2008 Wayne Davison way...@samba.org
Added installation of /etc/xinetd.d/rsync file and some commented-out
diff --git a/rsync.yo b/rsync.yo
index cf92499..bb5fba4 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsync)(1)(31 Dec 2009)()()
+manpage(rsync)(1)(22 Feb 2011)()()
manpagename(rsync)(a fast, versatile, remote (and local) file-copying tool)
manpagesynopsis()
@@ -2999,7 +2999,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.7 of rsync.
+This man page is current for version 3.0.8pre1 of rsync.
manpagesection(INTERNAL OPTIONS)
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 19e44b3..cff23e4 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -1,5 +1,5 @@
mailto(rsync-b...@samba.org)
-manpage(rsyncd.conf)(5)(31 Dec 2009)()()
+manpage(rsyncd.conf)(5)(22 Feb 2011)()()
manpagename(rsyncd.conf)(configuration file for rsync in daemon mode)
manpagesynopsis()
@@ -700,7 +700,7 @@ url(http://rsync.samba.org/)(http://rsync.samba.org/)
manpagesection(VERSION)
-This man page is current for version 3.0.7 of rsync.
+This man page is current for version 3.0.8pre1 of rsync.
manpagesection(CREDITS)
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via 8b7f20b Mention latest changes. via 1dabd5d A few more xattr-support fixes from the master branch. via 58d657c Be clear on which part(s) of testsuite's checkit() failed. via e46262f Fix issues with unchanged_attrs() for symlinks. via 4d92246 Use ftruncate() at the end of a --sparse file. Fixes bug 7337. via 8f48ba0 Integrate time-setting fixes/improvements from the master branch. via eb80585 Make case_N.h more generic. via 3c624bb Better mask handling, including some changes to help solaris. via 24e76f8 Pass new_mode to set_acl() and change its return values. via b62ea51 Put file descriptor arg at the start of the arg list for consistency. from a6b3c2b Added more missing NEWS items. ;a=shortlog;h=b3.0.x - Log - commit 8b7f20b6d35ee7458665c33114919567f5793503 Author: Wayne Davison way...@samba.org Date: Mon Feb 21 10:20:29 2011 -0800 Mention latest changes. commit 1dabd5dc9a46eb48b8525bf76a78218cf31e9e37 Author: Wayne Davison way...@samba.org Date: Mon Feb 21 08:04:31 2011 -0800 A few more xattr-support fixes from the master branch. commit 58d657c98f7e49ecdfefd72d525cca570d48de77 Author: Wayne Davison way...@samba.org Date: Sat Jan 1 17:28:56 2011 -0800 Be clear on which part(s) of testsuite's checkit() failed. commit e46262f36d617c7aa3e3b5615437722930a23e1b Author: Wayne Davison way...@samba.org Date: Sat Dec 18 08:48:07 2010 -0800 Fix issues with unchanged_attrs() for symlinks. commit 4d92246a549af10990161e65c60304a5135e7cef Author: Wayne Davison way...@samba.org Date: Sat Nov 6 09:57:23 2010 -0700 Use ftruncate() at the end of a --sparse file. Fixes bug 7337. commit 8f48ba03b53dfb62c866ecc617a6919fa6b8910d Author: Wayne Davison way...@samba.org Date: Mon Feb 21 09:48:37 2011 -0800 Integrate time-setting fixes/improvements from the master branch. commit eb8058577db2c728a8b40a06c3fdb4416b19a843 Author: Wayne Davison way...@samba.org Date: Thu Aug 26 10:13:04 2010 -0700 Make case_N.h more generic. commit 3c624bba85930590bc349fa7a7076444ba14e9d8 Author: Wayne Davison way...@samba.org Date: Sat Sep 12 09:40:31 2009 -0700 Better mask handling, including some changes to help solaris. commit 24e76f840e16667944b267636d60537be7235013 Author: Wayne Davison way...@samba.org Date: Sat Sep 12 09:27:07 2009 -0700 Pass new_mode to set_acl() and change its return values. commit b62ea517f6bc11e208f55f6b08193499d18e5926 Author: Wayne Davison way...@samba.org Date: Sat Sep 12 09:13:38 2009 -0700 Put file descriptor arg at the start of the arg list for consistency. --- Summary of changes: NEWS| 15 ++- acls.c | 120 ++ case_N.h| 79 - cleanup.c | 13 - compat.c|6 +- configure.ac|3 +- fileio.c| 28 +++- flist.c | 13 +++--- generator.c | 108 ++ options.c | 23 ++ receiver.c |5 +- rsync.c | 12 +++-- rsync.h | 16 +++ syscall.c | 90 ++ t_stub.c|1 + testsuite/rsync.fns | 11 +++-- util.c | 73 ++- xattrs.c| 31 +++--- 18 files changed, 435 insertions(+), 212 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index 2d57124..17429d4 100644 --- a/NEWS +++ b/NEWS @@ -21,7 +21,7 @@ Changes since 3.0.7: being too big and skip it. - For devices and special files, we now avoid gathering useless ACL and/or - xattr information for files that aren't being copied. (The uncopied + xattr information for files that aren't being copied. (The un-copied files are still put into the file list, but there's no need to gather data that is not going to be used.) This ensures that if the user uses --no-D, that rsync can't possibly complain about being unable to gather @@ -41,6 +41,11 @@ Changes since 3.0.7: - If the destination arg is an empty string, it will be treated as a reference to the current directory (as 2.x used to do). +- If rsync was compiled with a newer time-setting function (such as + lutimes), rsync will fall-back to an older function (such as utimes) on a + system where the newer function is not around. This helps to make the + rsync binary more portable in mixed-OS-release situations. + - Fixed a batch-file writing bug that would not write out the full set of compatibility flags that the transfer was using. This
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via a6b3c2b Added more missing NEWS items. via 4e95f91 Some manpage enhancements. via fad4ab9 Suggest a better solution for a make without wildcard support. via f91b15f Add .hg dir exclude to default_cvsignore list. Fixes bug 7957. from 83b94ef Switch over to Matt's idea of using FLAG_OWNED_BY_US. ;a=shortlog;h=b3.0.x - Log - commit a6b3c2b512ddc3ac480bdad583294e879be9d617 Author: Wayne Davison way...@samba.org Date: Sun Feb 20 23:32:21 2011 -0800 Added more missing NEWS items. commit 4e95f91f27d978fa4b3a9fd8fed080a1306fb4e6 Author: Wayne Davison way...@samba.org Date: Sun Feb 20 23:31:55 2011 -0800 Some manpage enhancements. commit fad4ab9d0b5046f3232cf612af8fbc9960044546 Author: Wayne Davison way...@samba.org Date: Sun Feb 20 22:07:22 2011 -0800 Suggest a better solution for a make without wildcard support. commit f91b15fbd6a7d0b9dcfb642d35238df8f0b51202 Author: Wayne Davison way...@samba.org Date: Thu Feb 17 22:07:20 2011 -0800 Add .hg dir exclude to default_cvsignore list. Fixes bug 7957. --- Summary of changes: INSTALL |5 +-- NEWS | 54 +++-- exclude.c |2 +- rsync.yo | 66 +++- 4 files changed, 97 insertions(+), 30 deletions(-) Changeset truncated at 500 lines: diff --git a/INSTALL b/INSTALL index ec551cc..6c016ad 100644 --- a/INSTALL +++ b/INSTALL @@ -33,9 +33,8 @@ your make has a problem with this rule, you will see an error like this: Don't know how to make ./*.c -You can change the proto.h-tstamp target to omit its prerequisite args, -but keep in mind that this will make a manual removal of proto.h-tstamp -necessary anytime the function prototypes change. +You can change the proto.h-tstamp target in Makefile.in to list all the *.c +filenames explicitly in order to avoid this issue. RPM NOTES - diff --git a/NEWS b/NEWS index ca4e65d..2d57124 100644 --- a/NEWS +++ b/NEWS @@ -8,10 +8,29 @@ Changes since 3.0.7: exactly MAXPATHLEN was not handled correctly, and one handling a --backup-dir that is extra extra large. +- Fixed a data-corruption issue when preserving hard-links without + preserving file ownership, and doing deletions either before or during + the transfer. This fixes some assert errors in the hard-linking code, + and some potential failed checksums (via -c) that should have matched. + - Fixed a potential crash when an rsync daemon has a filter/exclude list - and the transfer is using ACLs or extended attributes. + and the transfer is using ACLs or xattrs. + +- Fixed a hang if a really large file is being processed by an rsync that + can't handle 64-bit numbers. Rsync will now complain about the file + being too big and skip it. + +- For devices and special files, we now avoid gathering useless ACL and/or + xattr information for files that aren't being copied. (The uncopied + files are still put into the file list, but there's no need to gather + data that is not going to be used.) This ensures that if the user uses + --no-D, that rsync can't possibly complain about being unable to gather + extended information from special files that are in the file list (but + not in the transfer). -- Properly handle requesting remote filenames that start with a dash. +- Properly handle requesting remote filenames that start with a dash. This + avoids a potential error where a filename could be interpreted as a + (usually invalid) option. - Fixed a bug in the comparing of upper-case letters in file suffixes for --skip-compress. @@ -36,16 +55,20 @@ Changes since 3.0.7: an inplace chunk was handled by a seek rather than a read+write. - If we fail to connect to an rsync daemon, report all the connection - errors (e.g. ipv4 ipv6), not just the last one. + errors (e.g. IPv4 IPv6), not just the last one. -- Fixed an issue where an xattr and/or acl transfer that used an alt-dest +- Fixed an issue where an xattr and/or ACL transfer that used an alt-dest option (e.g. --link-dest) could output an error trying to itemize the - changes against the alt-dest directory's xattr/acl info but was instead - tryring to access the not-yet-existing new destination directory. + changes against the alt-dest directory's xattr/ACL info but was instead + trying to access the not-yet-existing new destination directory. - Improved xattr system-error messages to mention the full path to the file. +- Avoid trying to read/write xattrs on certain file types for certain OSes. + Improved configure to set NO_SYMLINK_XATTRS,
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c499002 Fix a random flist data bug w/delete, inc-recurse, and no
-o. Fixes bug 7936.
from c825514 Optimize finding the sum that matches our --inplace
position.
;a=shortlog;h=b3.0.x
- Log -
commit c499002e51db14b3b0c3b33680dc0955fe37206d
Author: Wayne Davison way...@samba.org
Date: Sat Jan 29 19:25:53 2011 -0800
Fix a random flist data bug w/delete, inc-recurse, and no -o.
Fixes bug 7936.
---
Summary of changes:
flist.c | 14 +-
generator.c | 30 +++---
log.c |2 --
rsync.c |2 --
rsync.h | 11 ++-
5 files changed, 26 insertions(+), 33 deletions(-)
Changeset truncated at 500 lines:
diff --git a/flist.c b/flist.c
index 86e4541..59109bc 100644
--- a/flist.c
+++ b/flist.c
@@ -52,12 +52,9 @@ extern int preserve_hard_links;
extern int preserve_devices;
extern int preserve_specials;
extern int delete_during;
-extern int uid_ndx;
-extern int gid_ndx;
extern int eol_nulls;
extern int relative_paths;
extern int implied_dirs;
-extern int file_extra_cnt;
extern int ignore_perishable;
extern int non_perishable_cnt;
extern int prune_empty_dirs;
@@ -1230,6 +1227,9 @@ struct file_struct *make_file(const char *fname, struct
file_list *flist,
linkname_len = 0;
#endif
+ if (!uid_ndx flags FLAG_DEL_NEEDS_UID)
+ extra_len += EXTRA_LEN;
+
#if SIZEOF_CAPITAL_OFF_T = 8
if (st.st_size 0xu S_ISREG(st.st_mode))
extra_len += EXTRA_LEN;
@@ -1288,6 +1288,8 @@ struct file_struct *make_file(const char *fname, struct
file_list *flist,
file-mode = st.st_mode;
if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */
F_OWNER(file) = st.st_uid;
+ else if (flags FLAG_DEL_NEEDS_UID)
+ F_DEL_OWNER(file) = st.st_uid;
if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
F_GROUP(file) = st.st_gid;
@@ -3044,13 +3046,14 @@ char *f_name(const struct file_struct *f, char *fbuf)
* of the dirname string, and also indicates that dirname is a MAXPATHLEN
* buffer (the functions we call will append names onto the end, but the old
* dir value will be restored on exit). */
-struct file_list *get_dirlist(char *dirname, int dlen, int ignore_filter_rules)
+struct file_list *get_dirlist(char *dirname, int dlen, int flags)
{
struct file_list *dirlist;
char dirbuf[MAXPATHLEN];
int save_recurse = recurse;
int save_xfer_dirs = xfer_dirs;
int save_prune_empty_dirs = prune_empty_dirs;
+ int senddir_fd = flags GDL_IGNORE_FILTER_RULES ? -2 : -1;
if (dlen 0) {
dlen = strlcpy(dirbuf, dirname, MAXPATHLEN);
@@ -3063,7 +3066,8 @@ struct file_list *get_dirlist(char *dirname, int dlen,
int ignore_filter_rules)
recurse = 0;
xfer_dirs = 1;
- send_directory(ignore_filter_rules ? -2 : -1, dirlist, dirname, dlen,
FLAG_CONTENT_DIR);
+ send_directory(senddir_fd, dirlist, dirname, dlen,
+ FLAG_CONTENT_DIR | (flags GDL_DEL_NEEDS_UID ?
FLAG_DEL_NEEDS_UID : 0));
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
diff --git a/generator.c b/generator.c
index e14b72e..dd23100 100644
--- a/generator.c
+++ b/generator.c
@@ -44,8 +44,6 @@ extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_perms;
extern int preserve_times;
-extern int uid_ndx;
-extern int gid_ndx;
extern int delete_mode;
extern int delete_before;
extern int delete_during;
@@ -169,19 +167,12 @@ static enum delret delete_item(char *fbuf, uint16 mode,
uint16 flags)
do_chmod(fbuf, mode | S_IWUSR);
if (S_ISDIR(mode) !(flags DEL_DIR_IS_EMPTY)) {
- int save_uid_ndx = uid_ndx;
/* This only happens on the first call to delete_item() since
* delete_dir_contents() always calls us w/DEL_DIR_IS_EMPTY. */
- if (!uid_ndx)
- uid_ndx = ++file_extra_cnt;
ignore_perishable = 1;
/* If DEL_RECURSE is not set, this just reports emptiness. */
ret = delete_dir_contents(fbuf, flags);
ignore_perishable = 0;
- if (!save_uid_ndx) {
- --file_extra_cnt;
- uid_ndx = 0;
- }
if (ret == DR_NOT_EMPTY || ret == DR_AT_LIMIT)
goto check_ret;
/* OK: try to delete the directory. */
@@ -260,7 +251,7 @@ static enum delret delete_dir_contents(char *fname, uint16
flags)
save_filters = push_local_filters(fname, dlen);
non_perishable_cnt = 0;
- dirlist =
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 83b94ef Switch over to Matt's idea of using FLAG_OWNED_BY_US.
from 2064c28 Move FLAG_DEL_NEEDS_UID into the not stored section.
;a=shortlog;h=b3.0.x
- Log -
commit 83b94efa6b60a3ff5eee4c5f7812c617a90a03f6
Author: Wayne Davison way...@samba.org
Date: Sat Jan 29 22:10:43 2011 -0800
Switch over to Matt's idea of using FLAG_OWNED_BY_US.
---
Summary of changes:
flist.c | 15 ++-
generator.c | 10 --
rsync.h | 12
3 files changed, 14 insertions(+), 23 deletions(-)
Changeset truncated at 500 lines:
diff --git a/flist.c b/flist.c
index 59109bc..7dec152 100644
--- a/flist.c
+++ b/flist.c
@@ -67,6 +67,7 @@ extern int use_safe_inc_flist;
extern int need_unsorted_flist;
extern int sender_symlink_iconv;
extern int unsort_ndx;
+extern uid_t our_uid;
extern struct stats stats;
extern char *filesfrom_host;
@@ -1227,9 +1228,6 @@ struct file_struct *make_file(const char *fname, struct
file_list *flist,
linkname_len = 0;
#endif
- if (!uid_ndx flags FLAG_DEL_NEEDS_UID)
- extra_len += EXTRA_LEN;
-
#if SIZEOF_CAPITAL_OFF_T = 8
if (st.st_size 0xu S_ISREG(st.st_mode))
extra_len += EXTRA_LEN;
@@ -1286,12 +1284,12 @@ struct file_struct *make_file(const char *fname, struct
file_list *flist,
}
#endif
file-mode = st.st_mode;
- if (uid_ndx) /* Check uid_ndx instead of preserve_uid for del support */
+ if (preserve_uid)
F_OWNER(file) = st.st_uid;
- else if (flags FLAG_DEL_NEEDS_UID)
- F_DEL_OWNER(file) = st.st_uid;
- if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
+ if (preserve_gid)
F_GROUP(file) = st.st_gid;
+ if (am_generator st.st_uid == our_uid)
+ file-flags |= FLAG_OWNED_BY_US;
if (basename != thisname)
file-dirname = lastdir;
@@ -3066,8 +3064,7 @@ struct file_list *get_dirlist(char *dirname, int dlen,
int flags)
recurse = 0;
xfer_dirs = 1;
- send_directory(senddir_fd, dirlist, dirname, dlen,
- FLAG_CONTENT_DIR | (flags GDL_DEL_NEEDS_UID ?
FLAG_DEL_NEEDS_UID : 0));
+ send_directory(senddir_fd, dirlist, dirname, dlen, FLAG_CONTENT_DIR);
xfer_dirs = save_xfer_dirs;
recurse = save_recurse;
if (do_progress)
diff --git a/generator.c b/generator.c
index dd23100..0c30604 100644
--- a/generator.c
+++ b/generator.c
@@ -251,7 +251,7 @@ static enum delret delete_dir_contents(char *fname, uint16
flags)
save_filters = push_local_filters(fname, dlen);
non_perishable_cnt = 0;
- dirlist = get_dirlist(fname, dlen, GDL_DEL_NEEDS_UID);
+ dirlist = get_dirlist(fname, dlen, 0);
ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
if (!dirlist-used)
@@ -273,7 +273,6 @@ static enum delret delete_dir_contents(char *fname, uint16
flags)
for (j = dirlist-used; j--; ) {
struct file_struct *fp = dirlist-files[j];
- uid_t fp_owner = uid_ndx ? F_OWNER(fp) : F_DEL_OWNER(fp);
if (fp-flags FLAG_MOUNT_DIR S_ISDIR(fp-mode)) {
if (verbose 1) {
@@ -286,7 +285,7 @@ static enum delret delete_dir_contents(char *fname, uint16
flags)
}
strlcpy(p, fp-basename, remainder);
- if (!(fp-mode S_IWUSR) !am_root fp_owner == our_uid)
+ if (!(fp-mode S_IWUSR) !am_root fp-flags
FLAG_OWNED_BY_US)
do_chmod(fname, fp-mode | S_IWUSR);
/* Save stack by recursing to ourself directly. */
if (S_ISDIR(fp-mode)) {
@@ -495,7 +494,7 @@ static void delete_in_dir(char *fbuf, struct file_struct
*file, dev_t *fs_dev)
return;
}
- dirlist = get_dirlist(fbuf, dlen, GDL_DEL_NEEDS_UID);
+ dirlist = get_dirlist(fbuf, dlen, 0);
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
@@ -514,8 +513,7 @@ static void delete_in_dir(char *fbuf, struct file_struct
*file, dev_t *fs_dev)
* a delete_item call with a DEL_MAKE_ROOM flag. */
if (flist_find_ignore_dirness(cur_flist, fp) 0) {
int flags = DEL_RECURSE;
- uid_t fp_owner = uid_ndx ? F_OWNER(fp) :
F_DEL_OWNER(fp);
- if (!(fp-mode S_IWUSR) !am_root fp_owner ==
our_uid)
+ if (!(fp-mode S_IWUSR) !am_root fp-flags
FLAG_OWNED_BY_US)
flags |= DEL_NO_UID_WRITE;
f_name(fp, delbuf);
if (delete_during == 2) {
diff --git a/rsync.h b/rsync.h
index
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c825514 Optimize finding the sum that matches our --inplace
position.
from eee85e3 Make sure an alternate --inplace sum has the right length
and add missing break in --inplace same-offset loop.
;a=shortlog;h=b3.0.x
- Log -
commit c8255147b06b74dad940d32f9cef5fbe17595239
Author: Wayne Davison way...@samba.org
Date: Sun Jan 16 17:06:54 2011 -0800
Optimize finding the sum that matches our --inplace position.
---
Summary of changes:
match.c | 33 +++--
1 files changed, 15 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/match.c b/match.c
index 70d6635..658d786 100644
--- a/match.c
+++ b/match.c
@@ -141,7 +141,7 @@ static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf, OFF_T len)
{
OFF_T offset, aligned_offset, end;
- int32 k, want_i, backup;
+ int32 k, want_i, aligned_i, backup;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
int more;
@@ -166,7 +166,7 @@ static void hash_search(int f,struct sum_struct *s,
if (verbose 3)
rprintf(FINFO, sum=%.8x k=%ld\n, sum, (long)k);
- offset = aligned_offset = 0;
+ offset = aligned_offset = aligned_i = 0;
end = len + 1 - s-sums[s-count-1].len;
@@ -234,28 +234,25 @@ static void hash_search(int f,struct sum_struct *s,
* the adjacent want_i optimization. */
if (updating_basis_file) {
/* All the generator's chunks start at blength
boundaries. */
- while (aligned_offset offset)
+ while (aligned_offset offset) {
aligned_offset += s-blength;
+ aligned_i++;
+ }
if (offset == aligned_offset) {
- int32 i2;
- for (i2 = i; i2 = 0; i2 =
s-sums[i2].chain) {
- if (s-sums[i2].offset !=
offset)
- continue;
- if (i2 != i) {
- if (sum !=
s-sums[i2].sum1
-|| l != s-sums[i2].len
-|| memcmp(sum2,
s-sums[i2].sum2, s-s2length) != 0)
- break;
- i = i2;
- }
- /* This chunk remained in the
same spot in the old and new file. */
- s-sums[i].flags |=
SUMFLG_SAME_OFFSET;
- want_i = i;
- break;
+ if (i != aligned_i) {
+ if (sum !=
s-sums[aligned_i].sum1
+|| l != s-sums[aligned_i].len
+|| memcmp(sum2,
s-sums[aligned_i].sum2, s-s2length) != 0)
+ goto check_want_i;
+ i = aligned_i;
}
+ /* This identical chunk is in the same
spot in the old and new file. */
+ s-sums[i].flags |= SUMFLG_SAME_OFFSET;
+ want_i = i;
}
}
+ check_want_i:
/* we've found a match, but now check to see
* if want_i can hint at a better match. */
if (i != want_i want_i s-count
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via eee85e3 Make sure an alternate --inplace sum has the right length
and add missing break in --inplace same-offset loop.
from 0c0219f Some fixes and improvements from the master branch.
;a=shortlog;h=b3.0.x
- Log -
commit eee85e3c360d747be0d81594c03a80bc299bc345
Author: Wayne Davison way...@samba.org
Date: Fri Jan 14 10:29:54 2011 -0800
Make sure an alternate --inplace sum has the right length
and add missing break in --inplace same-offset loop.
---
Summary of changes:
match.c | 11 ++-
1 files changed, 6 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/match.c b/match.c
index b211077..70d6635 100644
--- a/match.c
+++ b/match.c
@@ -90,8 +90,7 @@ static void build_hash_table(struct sum_struct *s)
static OFF_T last_match;
-/**
- * Transmit a literal and/or match token.
+/* Transmit a literal and/or match token.
*
* This delightfully-named function is called either when we find a
* match and need to transmit all the unmatched data leading up to it,
@@ -99,9 +98,9 @@ static OFF_T last_match;
* transmit it. As a result of this second case, it is called even if
* we have not matched at all!
*
- * @param i If 0, the number of a matched token. If 0, indicates we
- * have only literal data.
- **/
+ * If i = 0, the number of a matched token. If 0, indicates we have
+ * only literal data. A -1 will send a 0-token-int too, and a -2 sends
+ * only literal data, w/o any token-int. */
static void matched(int f, struct sum_struct *s, struct map_struct *buf,
OFF_T offset, int32 i)
{
@@ -244,6 +243,7 @@ static void hash_search(int f,struct sum_struct *s,
continue;
if (i2 != i) {
if (sum !=
s-sums[i2].sum1
+|| l != s-sums[i2].len
|| memcmp(sum2,
s-sums[i2].sum2, s-s2length) != 0)
break;
i = i2;
@@ -251,6 +251,7 @@ static void hash_search(int f,struct sum_struct *s,
/* This chunk remained in the
same spot in the old and new file. */
s-sums[i].flags |=
SUMFLG_SAME_OFFSET;
want_i = i;
+ break;
}
}
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 0c0219f Some fixes and improvements from the master branch.
from a92edcb Avoid splitting a multi-byte character when trimming a
name. Fixes bug 7816. Also makes the get_tmpname() code and comments more like
the master.
;a=shortlog;h=b3.0.x
- Log -
commit 0c0219fe845d0d213782b7e67fdf65b5c5718f60
Author: Wayne Davison way...@samba.org
Date: Thu Jan 13 23:03:59 2011 -0800
Some fixes and improvements from the master branch.
---
Summary of changes:
support/mnt-excl | 21 +
1 files changed, 13 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/support/mnt-excl b/support/mnt-excl
index 5514d96..e741865 100755
--- a/support/mnt-excl
+++ b/support/mnt-excl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
# This script takes a command-line arg of a source directory
# that will be passed to rsync, and generates a set of excludes
# that will exclude all mount points from the list. This is
@@ -18,19 +18,24 @@
# easily adapted to read /etc/mtab or similar.
#
# ADDENDUM: The addition of the --filter option (which has support for
-# absolute-anchored excludes) has made this script less useful than it
-# was. Beginning with 2.6.4, you can achieve the effect of this script
-# through this command:
+# absolute-anchored excludes) can make this screen unneeded in some
+# scenarios. If you don't need delete protection on the receiving side
+# (or if the destination path is identical to the source path), then you
+# can exclude some absolute paths from the transfer based on the mount
+# dirs. For instance:
#
-# awk '{print $2}' /proc/mounts | rsync -f 'merge,/- -' host:/dir /dest/
+# awk '{print $2}' /proc/mounts | grep -v '^/$' | \
+# rsync -avf 'merge,/- -' /dir host:/dest/
use strict;
+use warnings;
use Cwd 'abs_path';
my $file = '/proc/mounts';
my $dir = shift || '/';
-$dir = abs_path($dir);
-$dir =~ s#([^/]*)$##;
+my $trailing_slash = $dir =~ m{./$} ? '/' : '';
+$dir = abs_path($dir) . $trailing_slash;
+$dir =~ s{([^/]*)$}{};
my $trailing = $1;
$trailing = '' if $trailing eq '.' || !-d $dir$trailing;
$trailing .= '/' if $trailing ne '';
@@ -38,7 +43,7 @@ $trailing .= '/' if $trailing ne '';
open(IN, $file) or die Unable to open $file: $!\n;
while (IN) {
$_ = (split)[1];
-next unless s#^\Q$dir$trailing\E##o $_ ne '';
+next unless s{^\Q$dir$trailing\E}{}o $_ ne '';
print - /$trailing$_\n;
}
close IN;
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 17549c9 Mention that sorting the --files-from input is helpful.
from 9d6fe1a Avoid reading ACL/xattr info on filetypes not being copied.
Make Linux avoid xattr access on symlinks. Make OS X avoid xattr access on
device/special files. Fixes bug 5458.
;a=shortlog;h=b3.0.x
- Log -
commit 17549c95de7952c76d05893beb6cba1ad4120814
Author: Wayne Davison way...@samba.org
Date: Mon Jan 3 19:49:05 2011 -0800
Mention that sorting the --files-from input is helpful.
---
Summary of changes:
rsync.yo |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/rsync.yo b/rsync.yo
index a523f23..0bb9b58 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -1491,6 +1491,12 @@ bf(--files-from) filenames are being sent from one host
to another, the
filenames will be translated from the sending host's charset to the
receiving host's charset.
+NOTE: sorting the list of files in the --files-from input helps rsync to be
+more efficient, as it will avoid re-visiting the path elements that are shared
+between adjacent entries. If the input is not sorted, some path elements
+(implied directories) may end up being scanned multiple times, and rsync will
+eventually unduplicate them after they get turned into file-list elements.
+
dit(bf(-0, --from0)) This tells rsync that the rules/filenames it reads from a
file are terminated by a null ('\0') character, not a NL, CR, or CR+LF.
This affects bf(--exclude-from), bf(--include-from), bf(--files-from), and any
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via a92edcb Avoid splitting a multi-byte character when trimming a
name. Fixes bug 7816. Also makes the get_tmpname() code and comments more like
the master.
from 17549c9 Mention that sorting the --files-from input is helpful.
;a=shortlog;h=b3.0.x
- Log -
commit a92edcbf5ce7ee6a0069da0795f8b395cb699043
Author: Wayne Davison way...@samba.org
Date: Mon Jan 3 20:05:54 2011 -0800
Avoid splitting a multi-byte character when trimming a name.
Fixes bug 7816. Also makes the get_tmpname() code and comments
more like the master.
---
Summary of changes:
receiver.c | 51 ++-
1 files changed, 30 insertions(+), 21 deletions(-)
Changeset truncated at 500 lines:
diff --git a/receiver.c b/receiver.c
index 878ed00..202b678 100644
--- a/receiver.c
+++ b/receiver.c
@@ -64,31 +64,29 @@ static flist_ndx_list batch_redo_list;
/* We're either updating the basis file or an identical copy: */
static int updating_basis_or_equiv;
-/*
- * get_tmpname() - create a tmp filename for a given filename
+#define TMPNAME_SUFFIX .XX
+#define TMPNAME_SUFFIX_LEN ((int)sizeof TMPNAME_SUFFIX - 1)
+
+/* get_tmpname() - create a tmp filename for a given filename
*
- * If a tmpdir is defined, use that as the directory to
- * put it in. Otherwise, the tmp filename is in the same
- * directory as the given name. Note that there may be no
- * directory at all in the given name!
+ * If a tmpdir is defined, use that as the directory to put it in. Otherwise,
+ * the tmp filename is in the same directory as the given name. Note that
+ * there may be no directory at all in the given name!
*
- * The tmp filename is basically the given filename with a
- * dot prepended, and .XX appended (for mkstemp() to
- * put its unique gunk in). Take care to not exceed
- * either the MAXPATHLEN or NAME_MAX, esp. the last, as
- * the basename basically becomes 8 chars longer. In that
- * case, the original name is shortened sufficiently to
- * make it all fit.
+ * The tmp filename is basically the given filename with a dot prepended, and
+ * .XX appended (for mkstemp() to put its unique gunk in). We take care
+ * to not exceed either the MAXPATHLEN or NAME_MAX, especially the last, as
+ * the basename basically becomes 8 characters longer. In such a case, the
+ * original name is shortened sufficiently to make it all fit.
*
- * Of course, there's no real reason for the tmp name to
- * look like the original, except to satisfy us humans.
- * As long as it's unique, rsync will work.
- */
-
+ * Of course, the only reason the file is based on the original name is to
+ * make it easier to figure out what purpose a temp file is serving when a
+ * transfer is in progress. */
int get_tmpname(char *fnametmp, const char *fname)
{
int maxname, added, length = 0;
const char *f;
+ char *suf;
if (tmpdir) {
/* Note: this can't overflow, so the return value is safe */
@@ -108,8 +106,9 @@ int get_tmpname(char *fnametmp, const char *fname)
fnametmp[length++] = '.';
/* The maxname value is bufsize, and includes space for the '\0'.
-* (Note that NAME_MAX get -8 for the leading '.' above.) */
- maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
+* NAME_MAX needs an extra -1 for the name's leading dot. */
+ maxname = MIN(MAXPATHLEN - length - TMPNAME_SUFFIX_LEN,
+ NAME_MAX - 1 - TMPNAME_SUFFIX_LEN);
if (maxname 1) {
rprintf(FERROR_XFER, temporary filename too long: %s\n,
fname);
@@ -120,7 +119,17 @@ int get_tmpname(char *fnametmp, const char *fname)
added = strlcpy(fnametmp + length, f, maxname);
if (added = maxname)
added = maxname - 1;
- memcpy(fnametmp + length + added, .XX, 8);
+ suf = fnametmp + length + added;
+
+ /* Trim any dangling high-bit chars if the first-trimmed char (if any)
is
+* also a high-bit char, just in case we cut into a multi-byte sequence.
+* We are guaranteed to stop because of the leading '.' we added. */
+ if ((int)f[added] 0x80) {
+ while ((int)suf[-1] 0x80)
+ suf--;
+ }
+
+ memcpy(suf, TMPNAME_SUFFIX, TMPNAME_SUFFIX_LEN+1);
return 1;
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 63c5ac3 Report all socket connection errors if we fail. Fixes bug
6588.
via ce41e68 Itemize xattrs of a missing dir from an alt-dest dir. Fixes
bug 6576.
via 8538db7 Use full_fname() for system error messages.
via 559bd2f Tweak the year.
from 485a403 Protect a remote filename that starts with a dash.
;a=shortlog;h=b3.0.x
- Log -
commit 63c5ac38a2c5b121fff636650aa9f25fd2952ace
Author: Wayne Davison way...@samba.org
Date: Sat Jan 1 13:54:16 2011 -0800
Report all socket connection errors if we fail.
Fixes bug 6588.
commit ce41e68995d2e9a0d961b322348c849e39142e67
Author: Wayne Davison way...@samba.org
Date: Sat Jan 1 12:54:07 2011 -0800
Itemize xattrs of a missing dir from an alt-dest dir.
Fixes bug 6576.
commit 8538db7829b8584b78e23fba01253add3a355aa8
Author: Wayne Davison way...@samba.org
Date: Sat Jan 1 12:29:36 2011 -0800
Use full_fname() for system error messages.
commit 559bd2ff31eb389c94ca94c7d2d63bb1d4095ee0
Author: Wayne Davison way...@samba.org
Date: Sat Jan 1 11:27:40 2011 -0800
Tweak the year.
---
Summary of changes:
OLDNEWS |2 +-
generator.c |9 ++---
options.c |4 ++--
socket.c| 28 +++-
xattrs.c| 18 +-
5 files changed, 41 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/OLDNEWS b/OLDNEWS
index 2f17ac1..3922c79 100644
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -3094,7 +3094,7 @@ Changes since 2.4.6:
Partial Protocol History
RELEASE DATEVER.DATE OF COMMIT* PROTOCOL
- ?? ??? 2010 3.0.8 30
+ ?? ??? 2011 3.0.8 30
31 Dec 2009 3.0.7 30
08 May 2009 3.0.6 30
28 Dec 2008 3.0.5 30
diff --git a/generator.c b/generator.c
index 635fcb9..c2fbc06 100644
--- a/generator.c
+++ b/generator.c
@@ -1408,6 +1408,8 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
goto cleanup;
}
+ fnamecmp = fname;
+
if (is_dir) {
if (!implied_dirs file-flags FLAG_IMPLIED_DIR)
goto cleanup;
@@ -1455,11 +1457,13 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
itemizing = 0;
code = FNONE;
statret = 1;
- } else if (j = 0)
+ } else if (j = 0) {
statret = 1;
+ fnamecmp = fnamecmpbuf;
+ }
}
if (itemizing f_out != -1) {
- itemize(fname, file, ndx, statret, sx,
+ itemize(fnamecmp, file, ndx, statret, sx,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
if (real_ret != 0 do_mkdir(fname,file-mode) 0 errno !=
EEXIST) {
@@ -1739,7 +1743,6 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
goto cleanup;
}
- fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
if (statret == 0 !S_ISREG(sx.st.st_mode)) {
diff --git a/options.c b/options.c
index 075c890..579c430 100644
--- a/options.c
+++ b/options.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 1998-2001 Andrew Tridgell tri...@samba.org
* Copyright (C) 2000, 2001, 2002 Martin Pool m...@samba.org
- * Copyright (C) 2002-2010 Wayne Davison
+ * Copyright (C) 2002-2011 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -259,7 +259,7 @@ static void print_rsync_version(enum logcode f)
rprintf(f, %s version %s protocol version %d%s\n,
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
- rprintf(f, Copyright (C) 1996-2010 by Andrew Tridgell, Wayne Davison,
and others.\n);
+ rprintf(f, Copyright (C) 1996-2011 by Andrew Tridgell, Wayne Davison,
and others.\n);
rprintf(f, Web site: http://rsync.samba.org/\n;);
rprintf(f, Capabilities:\n);
rprintf(f, %d-bit files, %d-bit inums, %d-bit timestamps, %d-bit
long ints,\n,
diff --git a/socket.c b/socket.c
index e496755..89a636f 100644
--- a/socket.c
+++ b/socket.c
@@ -182,7 +182,7 @@ int open_socket_out(char *host, int port, const char
*bind_addr,
int af_hint)
{
int type = SOCK_STREAM;
- int error, s;
+ int error, s, j, addr_cnt, *errnos;
struct addrinfo hints, *res0, *res;
char portbuf[10];
char *h, *cp;
@@ -244,12 +244,17 @@ int
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c3ee6ac Avoid directory permission issues with --fake-super. Fixes
bug 7070.
from 63c5ac3 Report all socket connection errors if we fail. Fixes bug
6588.
;a=shortlog;h=b3.0.x
- Log -
commit c3ee6ac369385dca23ca9678e792b297a622dd36
Author: Wayne Davison way...@samba.org
Date: Sat Jan 1 16:39:55 2011 -0800
Avoid directory permission issues with --fake-super.
Fixes bug 7070.
---
Summary of changes:
generator.c | 15 +++
receiver.c| 15 +--
testsuite/xattrs.test | 20 +++-
3 files changed, 43 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index c2fbc06..e14b72e 100644
--- a/generator.c
+++ b/generator.c
@@ -1411,8 +1411,15 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
fnamecmp = fname;
if (is_dir) {
+ mode_t added_perms;
if (!implied_dirs file-flags FLAG_IMPLIED_DIR)
goto cleanup;
+ if (am_root 0) {
+ /* For --fake-super, the dir must be useable by the
copying
+* user, just like it would be for root. */
+ added_perms = S_IRUSR|S_IWUSR|S_IXUSR;
+ } else
+ added_perms = 0;
if (is_dir 0) {
/* In inc_recurse mode we want to make sure any missing
* directories get created while we're still processing
@@ -1423,7 +1430,7 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
(S_ISDIR(sx.st.st_mode)
|| delete_item(fname, sx.st.st_mode, del_opts |
DEL_FOR_DIR) != 0))
goto cleanup; /* Any errors get reported later.
*/
- if (do_mkdir(fname, file-mode 0700) == 0)
+ if (do_mkdir(fname, (file-mode|added_perms) 0700) ==
0)
file-flags |= FLAG_DIR_CREATED;
goto cleanup;
}
@@ -1466,10 +1473,10 @@ static void recv_generator(char *fname, struct
file_struct *file, int ndx,
itemize(fnamecmp, file, ndx, statret, sx,
statret ? ITEM_LOCAL_CHANGE : 0, 0, NULL);
}
- if (real_ret != 0 do_mkdir(fname,file-mode) 0 errno !=
EEXIST) {
+ if (real_ret != 0 do_mkdir(fname,file-mode|added_perms) 0
errno != EEXIST) {
if (!relative_paths || errno != ENOENT
- || create_directory_path(fname) 0
- || (do_mkdir(fname, file-mode) 0 errno !=
EEXIST)) {
+|| create_directory_path(fname) 0
+|| (do_mkdir(fname, file-mode|added_perms) 0
errno != EEXIST)) {
rsyserr(FERROR_XFER, errno,
recv_generator: mkdir %s failed,
full_fname(fname));
diff --git a/receiver.c b/receiver.c
index 467db5e..878ed00 100644
--- a/receiver.c
+++ b/receiver.c
@@ -24,6 +24,7 @@
extern int verbose;
extern int dry_run;
extern int do_xfers;
+extern int am_root;
extern int am_server;
extern int do_progress;
extern int inc_recurse;
@@ -131,15 +132,25 @@ int get_tmpname(char *fnametmp, const char *fname)
int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file)
{
int fd;
+ mode_t added_perms;
if (!get_tmpname(fnametmp, fname))
return -1;
+ if (am_root 0) {
+ /* For --fake-super, the file must be useable by the copying
+* user, just like it would be for root. */
+ added_perms = S_IRUSR|S_IWUSR;
+ } else {
+ /* For a normal copy, we need to be able to tweak things like
xattrs. */
+ added_perms = S_IWUSR;
+ }
+
/* We initially set the perms without the setuid/setgid bits or group
* access to ensure that there is no race condition. They will be
* correctly updated after the right owner and group info is set.
* (Thanks to sn...@epipe.fi for pointing this out.) */
- fd = do_mkstemp(fnametmp, file-mode INITACCESSPERMS);
+ fd = do_mkstemp(fnametmp, (file-mode|added_perms) INITACCESSPERMS);
#if 0
/* In most cases parent directories will already exist because their
@@ -149,7 +160,7 @@ int open_tmpfile(char *fnametmp, const char *fname, struct
file_struct *file)
create_directory_path(fnametmp) == 0) {
/* Get back to name with XX in it. */
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via c43624c Mention the latest changes. via 4baef8d Make xattrs.test more like the master version. from c3ee6ac Avoid directory permission issues with --fake-super. Fixes bug 7070. ;a=shortlog;h=b3.0.x - Log - commit c43624c5758809f3246a1394656ad8596c9834be Author: Wayne Davison way...@samba.org Date: Sat Jan 1 11:51:47 2011 -0800 Mention the latest changes. commit 4baef8d663800bbfccc1ad002afd7c6cf68fd9e3 Author: Wayne Davison way...@samba.org Date: Sat Jan 1 17:40:23 2011 -0800 Make xattrs.test more like the master version. --- Summary of changes: NEWS | 27 +-- testsuite/xattrs.test | 34 +++--- 2 files changed, 44 insertions(+), 17 deletions(-) Changeset truncated at 500 lines: diff --git a/NEWS b/NEWS index f53d70d..ca4e65d 100644 --- a/NEWS +++ b/NEWS @@ -4,12 +4,15 @@ Changes since 3.0.7: BUG FIXES: -- Fixed a buffer-overflow issue where a directory path that is exactly - MAXPATHLEN was not handled correctly. +- Fixed two buffer-overflow issues: one where a directory path that is + exactly MAXPATHLEN was not handled correctly, and one handling a + --backup-dir that is extra extra large. - Fixed a potential crash when an rsync daemon has a filter/exclude list and the transfer is using ACLs or extended attributes. +- Properly handle requesting remote filenames that start with a dash. + - Fixed a bug in the comparing of upper-case letters in file suffixes for --skip-compress. @@ -28,8 +31,28 @@ Changes since 3.0.7: hashing is working right, and to supply more information if the hard-link code fails. +- The --inplace code was improved to not search for an impossible checksum + position. The quadruple-verbose chunk[N] message will now mention when + an inplace chunk was handled by a seek rather than a read+write. + +- If we fail to connect to an rsync daemon, report all the connection + errors (e.g. ipv4 ipv6), not just the last one. + +- Fixed an issue where an xattr and/or acl transfer that used an alt-dest + option (e.g. --link-dest) could output an error trying to itemize the + changes against the alt-dest directory's xattr/acl info but was instead + tryring to access the not-yet-existing new destination directory. + +- Improved xattr system-error messages to mention the full path to the + file. + - Improved the unsafe-symlink errors messages. +- Fixed a bug setting xattrs on new files that aren't user writable. + +- Fixed a bug with --fake-super when copying files and dirs that aren't + user writable. + - Fix the popt arg parsing so that an option that doesn't take an arg will reject an attempt to supply and arg. diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test index 616b628..b61f561 100644 --- a/testsuite/xattrs.test +++ b/testsuite/xattrs.test @@ -48,7 +48,9 @@ makepath $chkdir/foo echo wow $chkdir/file1 cp_touch $fromdir/foo/file3 $chkdir/foo -files='foo file0 file1 file2 foo/file3 file4 foo/bar foo/bar/file5' +dirs='foo foo/bar' +files='file0 file1 file2 foo/file3 file4 foo/bar/file5' + uid_gid=`$TOOLDIR/tls $fromdir/foo | sed 's/^.* \([0-9][0-9]*\)\.\([0-9][0-9]*\) .*/\1:\2/'` cd $fromdir @@ -80,51 +82,53 @@ xset user.extra 'remove me' $chkdir/file1 xset user.foo 'old foo' $chkdir/foo/file3 xset $RUSR.equal 'this long attribute should remain the same and not need to be transferred' $chkdir/foo/file3 -xls $files $scratchdir/xattrs.txt +xls $dirs $files $scratchdir/xattrs.txt # OK, let's try a simple xattr copy. checkit $RSYNC -avX --super . '$chkdir/' $fromdir $chkdir cd $chkdir -xls $files | diff $diffopt $scratchdir/xattrs.txt - +xls $dirs $files | diff $diffopt $scratchdir/xattrs.txt - cd $fromdir checkit $RSYNC -aiX --super --copy-dest=../chk . ../to $fromdir $todir cd $todir -xls $files | diff $diffopt $scratchdir/xattrs.txt - +xls $dirs $files | diff $diffopt $scratchdir/xattrs.txt - cd $fromdir rm -rf $todir xset user.nice 'this is nice, but different' file1 -checkit $RSYNC -aiX --fake-super . ../chk $fromdir $chkdir - -cd $chkdir -xls $files $scratchdir/xattrs.txt +xls $dirs $files $scratchdir/xattrs.txt -cd $fromdir checkit $RSYNC -aiX --fake-super --link-dest=../chk . ../to $chkdir $todir cd $todir -xls $files | diff $diffopt $scratchdir/xattrs.txt - +xls $dirs $files | diff $diffopt $scratchdir/xattrs.txt - -sed -n -e '/\.\/file1$/d' -e '/^[^ ][^ ]* *[^ ][^ ]* *[^ ][^ ]* *1 /p' $scratchdir/ls-to $scratchdir/ls-diff +sed -n -e '/^[^ ][^ ]* *[^ ][^ ]* *[^ ][^ ]* *1 /p' $scratchdir/ls-to $scratchdir/ls-diff-all +fgrep -v './file1' $scratchdir/ls-diff-all $scratchdir/ls-diff
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 485a403 Protect a remote filename that starts with a dash.
from ede8cae Tweak some apostrophes to make editor highlighting less
problematic.
;a=shortlog;h=b3.0.x
- Log -
commit 485a40318c4dea1ecd52e2045b3a8e3e9b9965e7
Author: Wayne Davison way...@samba.org
Date: Thu Dec 23 09:26:39 2010 -0800
Protect a remote filename that starts with a dash.
---
Summary of changes:
clientserver.c |5 -
main.c |6 +-
2 files changed, 9 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/clientserver.c b/clientserver.c
index 0d47688..038900e 100644
--- a/clientserver.c
+++ b/clientserver.c
@@ -259,7 +259,10 @@ int start_inband_exchange(int f_in, int f_out, const char
*user, int argc, char
if (strncmp(*argv, modname, modlen) == 0
argv[0][modlen] == '\0')
sargs[sargc++] = modname; /* we send modname/ */
- else
+ else if (**argv == '-') {
+ if (asprintf(sargs + sargc++, ./%s, *argv) 0)
+ out_of_memory(start_inband_exchange);
+ } else
sargs[sargc++] = *argv;
argv++;
argc--;
diff --git a/main.c b/main.c
index 5591539..85e38f3 100644
--- a/main.c
+++ b/main.c
@@ -428,7 +428,11 @@ static pid_t do_cmd(char *cmd, char *machine, char *user,
char **remote_argv, in
rprintf(FERROR, internal: args[] overflowed in
do_cmd()\n);
exit_cleanup(RERR_SYNTAX);
}
- args[argc++] = *remote_argv++;
+ if (**remote_argv == '-') {
+ if (asprintf(args + argc++, ./%s,
*remote_argv++) 0)
+ out_of_memory(do_cmd);
+ } else
+ args[argc++] = *remote_argv++;
remote_argc--;
}
}
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated via ede8cae Tweak some apostrophes to make editor highlighting less problematic. from 58ab320 Optimize --inplace chunck search to avoid a non-aligned search. ;a=shortlog;h=b3.0.x - Log - commit ede8cae34b7f2a0a8d183229e43415ef87115bcc Author: Wayne Davison way...@samba.org Date: Sun Dec 19 09:00:39 2010 -0800 Tweak some apostrophes to make editor highlighting less problematic. --- Summary of changes: configure.ac |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/configure.ac b/configure.ac index 22cf710..d447b89 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ AC_DEFINE([_GNU_SOURCE], 1, [Define _GNU_SOURCE so that we get all necessary prototypes]) if test x$ac_cv_prog_cc_stdc = xno; then - AC_MSG_WARN([rsync requires an ANSI C compiler and you don't seem to have one]) + AC_MSG_WARN([rsync requires an ANSI C compiler and you do not seem to have one]) fi AC_ARG_ENABLE(profile, @@ -193,7 +193,7 @@ ipv6trylibc=yes AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--disable-ipv6], - [don't even try to use IPv6])) + [do not even try to use IPv6])) if test x$enable_ipv6 != xno; then AC_MSG_CHECKING([ipv6 stack type]) for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta cygwin; do @@ -307,7 +307,7 @@ AC_ARG_ENABLE([locale], AC_HELP_STRING([--disable-locale], [disable locale features])) AH_TEMPLATE([CONFIG_LOCALE], -[Undefine if you don't want locale features. By default this is defined.]) +[Undefine if you do not want locale features. By default this is defined.]) if test x$enable_locale != xno; then AC_DEFINE(CONFIG_LOCALE) fi -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 58ab320 Optimize --inplace chunck search to avoid a non-aligned
search.
via 00cde65 Mention seek effect of an unmoved --inplace chunk.
via e6ba6e1 Improve description of --chmod example.
from efad2e8 Fix crash when --backup-dir is excessively long.
;a=shortlog;h=b3.0.x
- Log -
commit 58ab32037daaa1012e5b87580058ca1a6df4ecda
Author: Wayne Davison way...@samba.org
Date: Sat Dec 18 08:27:03 2010 -0800
Optimize --inplace chunck search to avoid a non-aligned search.
commit 00cde6582c82d590895ca86bf1a2dc9a292d6d38
Author: Wayne Davison way...@samba.org
Date: Sat Dec 18 08:17:03 2010 -0800
Mention seek effect of an unmoved --inplace chunk.
commit e6ba6e1107b03ffef6ec87e555a84fae614f9266
Author: Wayne Davison way...@samba.org
Date: Sat Dec 18 08:13:52 2010 -0800
Improve description of --chmod example.
---
Summary of changes:
match.c| 39 ---
receiver.c |5 +++--
rsync.yo |5 -
3 files changed, 27 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/match.c b/match.c
index 45c512c..b211077 100644
--- a/match.c
+++ b/match.c
@@ -141,7 +141,7 @@ static void matched(int f, struct sum_struct *s, struct
map_struct *buf,
static void hash_search(int f,struct sum_struct *s,
struct map_struct *buf, OFF_T len)
{
- OFF_T offset, end;
+ OFF_T offset, aligned_offset, end;
int32 k, want_i, backup;
char sum2[SUM_LENGTH];
uint32 s1, s2, sum;
@@ -167,7 +167,7 @@ static void hash_search(int f,struct sum_struct *s,
if (verbose 3)
rprintf(FINFO, sum=%.8x k=%ld\n, sum, (long)k);
- offset = 0;
+ offset = aligned_offset = 0;
end = len + 1 - s-sums[s-count-1].len;
@@ -232,24 +232,26 @@ static void hash_search(int f,struct sum_struct *s,
/* When updating in-place, the best possible match is
* one with an identical offset, so we prefer that over
-* the following want_i optimization. */
+* the adjacent want_i optimization. */
if (updating_basis_file) {
- int32 i2;
- for (i2 = i; i2 = 0; i2 = s-sums[i2].chain) {
- if (s-sums[i2].offset != offset)
- continue;
- if (i2 != i) {
- if (sum != s-sums[i2].sum1)
- break;
- if (memcmp(sum2,
s-sums[i2].sum2,
- s-s2length) != 0)
- break;
- i = i2;
+ /* All the generator's chunks start at blength
boundaries. */
+ while (aligned_offset offset)
+ aligned_offset += s-blength;
+ if (offset == aligned_offset) {
+ int32 i2;
+ for (i2 = i; i2 = 0; i2 =
s-sums[i2].chain) {
+ if (s-sums[i2].offset !=
offset)
+ continue;
+ if (i2 != i) {
+ if (sum !=
s-sums[i2].sum1
+|| memcmp(sum2,
s-sums[i2].sum2, s-s2length) != 0)
+ break;
+ i = i2;
+ }
+ /* This chunk remained in the
same spot in the old and new file. */
+ s-sums[i].flags |=
SUMFLG_SAME_OFFSET;
+ want_i = i;
}
- /* This chunk was at the same offset on
-* both the sender and the receiver. */
- s-sums[i].flags |= SUMFLG_SAME_OFFSET;
- goto set_want_i;
}
}
@@ -264,7 +266,6 @@ static void hash_search(int f,struct sum_struct *s,
* will be happy */
i = want_i;
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via efad2e8 Fix crash when --backup-dir is excessively long.
from c463617 Some quoting fixes/improvements.
;a=shortlog;h=b3.0.x
- Log -
commit efad2e85ea819c99b601e6e55a4e3d419336033f
Author: Wayne Davison way...@samba.org
Date: Thu Dec 16 22:15:04 2010 -0800
Fix crash when --backup-dir is excessively long.
---
Summary of changes:
options.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/options.c b/options.c
index c01d71c..075c890 100644
--- a/options.c
+++ b/options.c
@@ -1491,17 +1491,18 @@ int parse_arguments(int *argc_p, const char ***argv_p)
return 0;
}
if (backup_dir) {
- backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof
backup_dir_buf);
- backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
- if (backup_dir_remainder 32) {
+ size_t len = strlcpy(backup_dir_buf, backup_dir, sizeof
backup_dir_buf);
+ if (len sizeof backup_dir_buf - 128) {
snprintf(err_buf, sizeof err_buf,
the --backup-dir path is WAY too long.\n);
return 0;
}
+ backup_dir_len = (int)len;
if (backup_dir_buf[backup_dir_len - 1] != '/') {
backup_dir_buf[backup_dir_len++] = '/';
backup_dir_buf[backup_dir_len] = '\0';
}
+ backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
if (verbose 1 !am_sender)
rprintf(FINFO, backup_dir is %s\n, backup_dir_buf);
} else if (!backup_suffix_len (!am_server || !am_sender)) {
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via c463617 Some quoting fixes/improvements.
via 6abb59a If we create an off_t type, define SIZEOF_OFF_T.
via d79bc5c Fix rsync_xal_set reference in an error.
via 10cd07c Avoid infinite loop if the file's length is negative. Fixes
bug 4664.
from 62e9eb7 Mention need of wildcard support in make. See bug 7625.
;a=shortlog;h=b3.0.x
- Log -
commit c463617443f999befe1b20cc5b3ffb484dee025b
Author: Wayne Davison way...@samba.org
Date: Mon Sep 6 08:41:46 2010 -0700
Some quoting fixes/improvements.
commit 6abb59adf61a64a9353c8477bc23a701ba7e139e
Author: Wayne Davison way...@samba.org
Date: Mon Sep 6 08:25:19 2010 -0700
If we create an off_t type, define SIZEOF_OFF_T.
commit d79bc5c791f443528405ad112a7aacae1b1655b1
Author: Wayne Davison way...@samba.org
Date: Mon Sep 6 08:09:20 2010 -0700
Fix rsync_xal_set reference in an error.
commit 10cd07c22555768819cdc3a00f1c51d3d7d777a7
Author: Wayne Davison way...@samba.org
Date: Sat Aug 21 11:26:21 2010 -0700
Avoid infinite loop if the file's length is negative.
Fixes bug 4664.
---
Summary of changes:
generator.c |6 ++
rsync.h |2 ++
support/lsh |6 +++---
xattrs.c|2 +-
4 files changed, 12 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/generator.c b/generator.c
index 3467cfa..635fcb9 100644
--- a/generator.c
+++ b/generator.c
@@ -761,6 +761,12 @@ static void sum_sizes_sqroot(struct sum_struct *sum, int64
len)
int s2length;
int64 l;
+ if (len 0) {
+ /* The file length overflowed our int64 var, so we can't
process this file. */
+ sum-count = -1; /* indicate overflow error */
+ return;
+ }
+
if (block_size)
blength = block_size;
else if (len = BLOCK_SIZE * BLOCK_SIZE)
diff --git a/rsync.h b/rsync.h
index d804d49..5f914d1 100644
--- a/rsync.h
+++ b/rsync.h
@@ -430,6 +430,8 @@ typedef unsigned int mode_t;
#endif
#ifndef HAVE_OFF_T
typedef long off_t;
+#undef SIZEOF_OFF_T
+#define SIZEOF_OFF_T SIZEOF_LONG
#endif
#ifndef HAVE_SIZE_T
typedef unsigned int size_t;
diff --git a/support/lsh b/support/lsh
index 2017126..65488dc 100755
--- a/support/lsh
+++ b/support/lsh
@@ -13,7 +13,7 @@ do_cd=y # Default path is user's home dir, just like ssh.
while : ; do
case $1 in
-l) user=$2; shift; shift ;;
--l*) user=`echo $1 | sed 's/^-l//'`; shift ;;
+-l*) user=`echo $1 | sed 's/^-l//'`; shift ;;
--no-cd) do_cd=n; shift ;;
-*) shift ;;
localhost) shift; break ;;
@@ -22,9 +22,9 @@ while : ; do
done
if [ $user ]; then
-prefix=sudo -H -u $user
+prefix=sudo -H -u '$user'
if [ $do_cd = y ]; then
- home=`perl -e print((getpwnam($user))[7])`
+ home=`perl -e print((getpwnam('$user'))[7])`
# Yeah, this may fail, but attempts to get sudo to cd are harder.
cd $home
fi
diff --git a/xattrs.c b/xattrs.c
index 773ac0d..a0b2583 100644
--- a/xattrs.c
+++ b/xattrs.c
@@ -857,7 +857,7 @@ static int rsync_xal_set(const char *fname, item_list *xalp,
if (i == xalp-count) {
if (sys_lremovexattr(fname, name) 0) {
rsyserr(FERROR_XFER, errno,
- rsync_xal_clear:
lremovexattr(\%s\,\%s\) failed,
+ rsync_xal_set:
lremovexattr(\%s\,\%s\) failed,
fname, name);
ret = -1;
} else /* make sure caller sets mtime */
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. - branch b3.0.x updated
The branch, b3.0.x has been updated
via 62e9eb7 Mention need of wildcard support in make. See bug 7625.
via de20d72 Remove duplication for -x option.
from f8cd1c4 A couple more NEWS items.
;a=shortlog;h=b3.0.x
- Log -
commit 62e9eb7bc2c593d40951f5099a36442537732a5c
Author: Wayne Davison way...@samba.org
Date: Thu Aug 26 08:27:20 2010 -0700
Mention need of wildcard support in make.
See bug 7625.
commit de20d72541d0059218dd17fa20ca761a8cf00523
Author: Wayne Davison way...@samba.org
Date: Thu Aug 26 07:58:22 2010 -0700
Remove duplication for -x option.
---
Summary of changes:
INSTALL | 14 +-
options.c |4 ++--
2 files changed, 15 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/INSTALL b/INSTALL
index 6b10dae..ec551cc 100644
--- a/INSTALL
+++ b/INSTALL
@@ -17,7 +17,7 @@ for the daemon by editing the NOBODY_USER and NOBODY_GROUP
defines in
config.h, or just override them in your /etc/rsyncd.conf file.
As of 2.4.7, rsync uses Eric Troan's popt option-parsing library. A
-cut-down copy of release 1.6.4 is included in the rsync distribution,
+cut-down copy of a recent release is included in the rsync distribution,
and will be used if there is no popt library on your build host, or if
the --with-included-popt option is passed to ./configure.
@@ -25,6 +25,18 @@ If you configure using --enable-maintainer-mode, then rsync
will try
to pop up an xterm on DISPLAY=:0 if it crashes. You might find this
useful, but it should be turned off for production builds.
+MAKE COMPATIBILITY
+--
+
+Note that Makefile.in has a rule that uses a wildcard in a prerequisite. If
+your make has a problem with this rule, you will see an error like this:
+
+Don't know how to make ./*.c
+
+You can change the proto.h-tstamp target to omit its prerequisite args,
+but keep in mind that this will make a manual removal of proto.h-tstamp
+necessary anytime the function prototypes change.
+
RPM NOTES
-
diff --git a/options.c b/options.c
index b428ce8..c01d71c 100644
--- a/options.c
+++ b/options.c
@@ -530,8 +530,8 @@ static struct poptOption long_options[] = {
{ignore-times,'I', POPT_ARG_NONE, ignore_times, 0, 0, 0 },
{size-only,0, POPT_ARG_NONE, size_only, 0, 0, 0 },
{one-file-system, 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
- {no-one-file-system,'x',POPT_ARG_VAL, one_file_system, 0, 0, 0 },
- {no-x,'x', POPT_ARG_VAL,one_file_system, 0, 0, 0 },
+ {no-one-file-system,0, POPT_ARG_VAL,one_file_system, 0, 0, 0 },
+ {no-x, 0, POPT_ARG_VAL,one_file_system, 0, 0, 0 },
{update, 'u', POPT_ARG_NONE, update_only, 0, 0, 0 },
{existing, 0, POPT_ARG_NONE, ignore_non_existing, 0, 0, 0 },
{ignore-non-existing,0,POPT_ARG_NONE, ignore_non_existing, 0, 0, 0 },
--
The rsync repository.
___
rsync-cvs mailing list
rsync-cvs@lists.samba.org
https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-23-ge36f5c9
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via e36f5c9f6cac48349fddc581ca90cecae4c18b11 (commit) via c9c32156984411006549e5c68a68e1dada0107e6 (commit) via dbfde9e50aa8dfab3fc919323e874a02e910701b (commit) via 1cdb5e1c869d21d55a60aef063a5717e777acfb7 (commit) via 24afdc500a326988d1bf66d4c1092160146cbec5 (commit) via 303759b803e1a382f7d7a62971058814bf0c42cd (commit) via a699f7c6afe182e60a8fe7713d7ee4b400835f0f (commit) via a250fa251be39e7357c756fb21f62fb0267d5011 (commit) via e44aa644c20956d0059cc7a983c92911eed34e70 (commit) via ef67c238b56b6fa28d08850220957a3fbc7fa3cd (commit) via 111599be2be2b1e77a0ca4483fba00d8cd35452d (commit) via 8e918e1861c3cf76c60381c7cec70c1803b3c8c4 (commit) from 0874fc487246c707afa433140509f6fe9adfc775 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e36f5c9f6cac48349fddc581ca90cecae4c18b11 Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:49:46 2010 -0700 Mention latest changes. commit c9c32156984411006549e5c68a68e1dada0107e6 Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:14:02 2010 -0700 Refer to the right lsetxattr() caller in a error message. commit dbfde9e50aa8dfab3fc919323e874a02e910701b Author: Wayne Davison way...@samba.org Date: Sat Jun 19 09:47:00 2010 -0700 Fix compression-ignoring of upper-case suffixes. Fixes bug 7512. commit 1cdb5e1c869d21d55a60aef063a5717e777acfb7 Author: Wayne Davison way...@samba.org Date: Sat Jun 19 09:29:42 2010 -0700 Fix a couple socketpair_tcp() issues (see bug 7514). commit 24afdc500a326988d1bf66d4c1092160146cbec5 Author: Wayne Davison way...@samba.org Date: Sat Mar 27 12:06:45 2010 -0700 Fix a typo that Andrea Gelmini pointed out. commit 303759b803e1a382f7d7a62971058814bf0c42cd Author: Wayne Davison way...@samba.org Date: Sat Mar 27 12:05:01 2010 -0700 Get rid of trailing whitespace. commit a699f7c6afe182e60a8fe7713d7ee4b400835f0f Author: Matt McCutchen m...@mattmccutchen.net Date: Wed Mar 17 01:08:28 2010 -0400 Man page description of --xattrs should not assume a push. commit a250fa251be39e7357c756fb21f62fb0267d5011 Author: Wayne Davison way...@samba.org Date: Sat Jun 26 10:52:04 2010 -0700 More manpage improvements. commit e44aa644c20956d0059cc7a983c92911eed34e70 Author: Matt McCutchen m...@mattmccutchen.net Date: Thu Nov 19 00:18:23 2009 -0500 Amplify the man page description of --hard-links (see bug 3693), and improve that of --inplace while I'm at it. commit ef67c238b56b6fa28d08850220957a3fbc7fa3cd Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:27:38 2010 -0700 Reject passing an arg to an option that doesn't take one (bug 6915). Based on a patch by Matt, but further tweaked to deal with -q=foo. commit 111599be2be2b1e77a0ca4483fba00d8cd35452d Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:24:58 2010 -0700 Mention 2010 in the main copyright. commit 8e918e1861c3cf76c60381c7cec70c1803b3c8c4 Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:23:31 2010 -0700 Make an empty-string dest-dir the same as . again. --- Summary of changes: NEWS| 12 ++ main.c |4 ++ options.c |4 +- popt/popt.c | 19 ++ popt/popt.h |1 + rsync.yo| 65 +++ rsync3.txt | 30 socket.c| 110 +- token.c |2 + xattrs.c|4 +- 10 files changed, 132 insertions(+), 119 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-25-g05022e0
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 05022e00a2cb5ba8b994c1f11ebe501efa2f0114 (commit) via 24a743b5650ad27c2db4a6323f714e072cdc595e (commit) from e36f5c9f6cac48349fddc581ca90cecae4c18b11 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 05022e00a2cb5ba8b994c1f11ebe501efa2f0114 Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:56:09 2010 -0700 More NEWS. commit 24a743b5650ad27c2db4a6323f714e072cdc595e Author: Wayne Davison way...@samba.org Date: Sat Jul 3 08:54:40 2010 -0700 If a module has no path setting, return an error. --- Summary of changes: NEWS |6 +- clientserver.c |5 + 2 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-11-g0874fc4
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 0874fc487246c707afa433140509f6fe9adfc775 (commit) via 55dbbdeafea0b7af0b96d789368942af9edd9743 (commit) via cbd27d5e18f3996e9c421481e64504600a659f3a (commit) via 178ccdde7d6fe1e7229942ad3d11f137b4026303 (commit) from e51bb8f330d6b6ee3979bb0538e42da997c50d75 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 0874fc487246c707afa433140509f6fe9adfc775 Author: Wayne Davison way...@samba.org Date: Wed Jun 30 09:04:21 2010 -0700 Setup for 3.0.8dev. commit 55dbbdeafea0b7af0b96d789368942af9edd9743 Author: Wayne Davison way...@samba.org Date: Wed Jun 30 08:58:40 2010 -0700 Fixed inconsistencies reported by packaging/var-checker. commit cbd27d5e18f3996e9c421481e64504600a659f3a Author: Wayne Davison way...@samba.org Date: Wed Jun 30 08:22:59 2010 -0700 Update support/rrsync and some packaging/* scripts. commit 178ccdde7d6fe1e7229942ad3d11f137b4026303 Author: Matt McCutchen m...@mattmccutchen.net Date: Mon Feb 8 20:45:39 2010 -0500 Rename configure.in to configure.ac, the current autoconf standard. --- Summary of changes: Makefile.in |2 +- NEWS | 69 ++-- OLDNEWS | 67 +++ checksum.c |2 - configure.in = configure.ac |2 +- exclude.c|2 +- generator.c |2 +- hlink.c |2 +- io.c |5 +- log.c|4 +- main.c |2 +- options.c|1 - packaging/cull_options |4 +- packaging/extern-squish | 18 -- packaging/git-status.pl | 48 + packaging/nightly-rsync | 56 +++- packaging/patch-update | 69 ++-- packaging/release-rsync | 120 ++--- packaging/var-checker| 83 + prepare-source.mak |4 +- receiver.c |2 +- support/rrsync | 16 +++--- testsuite/itemize.test |6 +- 23 files changed, 422 insertions(+), 164 deletions(-) rename configure.in = configure.ac (99%) delete mode 100755 packaging/extern-squish create mode 100644 packaging/git-status.pl create mode 100755 packaging/var-checker hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-7-ge51bb8f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via e51bb8f330d6b6ee3979bb0538e42da997c50d75 (commit) via 6d9207bd3837f22e54d7082998b73400ae64fa89 (commit) via 6b8756674421b575a9ea92cfc2cc62a179df18e4 (commit) via b384d71e53e6f4eed3cb1811551773285f6b0a69 (commit) from 11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit e51bb8f330d6b6ee3979bb0538e42da997c50d75 Author: Wayne Davison way...@samba.org Date: Sat Jun 26 16:14:15 2010 -0700 Write out the right compat_flags value into the batch file. commit 6d9207bd3837f22e54d7082998b73400ae64fa89 Author: Wayne Davison way...@samba.org Date: Sat Jun 26 16:13:58 2010 -0700 Turn some asserts into descriptive errors. commit 6b8756674421b575a9ea92cfc2cc62a179df18e4 Author: Wayne Davison way...@samba.org Date: Sat Jun 26 16:13:20 2010 -0700 Make sure our use of idev_find() hashtable is right while also supporting older rsyncs that send dev == 0. commit b384d71e53e6f4eed3cb1811551773285f6b0a69 Author: Wayne Davison way...@samba.org Date: Sat Jun 26 11:32:14 2010 -0700 Make sure that the code doesn't try to use an illegal key. --- Summary of changes: compat.c|2 +- flist.c | 16 +--- hashtable.c |9 +++-- hlink.c | 24 ++-- io.c|3 ++- 5 files changed, 37 insertions(+), 17 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-3-g11f4f34
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9 (commit) from fe2c582af879a633c346d0c36da3ca79f5d7ff3b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 11f4f34ed96eafd0ff9e1d5813e5476790a4b6e9 Author: Wayne Davison way...@samba.org Date: Fri Jun 4 23:10:47 2010 -0700 Fix daemon-filter crash issue (bug 7489). --- Summary of changes: generator.c | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-2-gfe2c582
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via fe2c582af879a633c346d0c36da3ca79f5d7ff3b (commit) from 2ecd8b7cd27f692d2832dc6908ca6a6fe1d310fe (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit fe2c582af879a633c346d0c36da3ca79f5d7ff3b Author: Wayne Davison way...@samba.org Date: Wed Mar 31 14:56:52 2010 -0700 Removing now-redundant path-size check from send_if_directory(). --- Summary of changes: flist.c |6 -- 1 files changed, 0 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7-1-g2ecd8b7
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 2ecd8b7cd27f692d2832dc6908ca6a6fe1d310fe (commit) from 54f00c3f89fc147f2f9cba89d26a5bb1d20e783b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 2ecd8b7cd27f692d2832dc6908ca6a6fe1d310fe Author: Wayne Davison way...@samba.org Date: Fri Mar 26 16:56:40 2010 -0700 Fix directory-length overflow bug (7057). --- Summary of changes: flist.c | 20 ++-- 1 files changed, 14 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7pre2-4-g54f00c3
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 54f00c3f89fc147f2f9cba89d26a5bb1d20e783b (commit) from 1fc8c51705924d191e404692b5082c6a0dada200 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 54f00c3f89fc147f2f9cba89d26a5bb1d20e783b Author: Wayne Davison way...@samba.org Date: Thu Dec 31 13:08:07 2009 -0800 Preparing for release of 3.0.7 --- Summary of changes: NEWS |2 +- OLDNEWS |2 +- configure.in |2 +- packaging/lsb/rsync.spec | 10 +- rsync.yo |4 ++-- rsyncd.conf.yo |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7pre2-1-g808b1d6
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 808b1d61c0085d4d8fba6a949da5bbd11480c59c (commit) from 2f01fb11526f4a8fed3e5e6189706845c04136f3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 808b1d61c0085d4d8fba6a949da5bbd11480c59c Author: Wayne Davison way...@samba.org Date: Wed Dec 30 12:25:33 2009 -0800 Fixed the passing of a '/' modifier for an absolute-path filter rule. --- Summary of changes: NEWS |3 +++ exclude.c |2 ++ 2 files changed, 5 insertions(+), 0 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.7pre2-3-g1fc8c51
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 1fc8c51705924d191e404692b5082c6a0dada200 (commit) via b04604945d7d3868f3d914aa7e9ec0d00f8a974e (commit) from 808b1d61c0085d4d8fba6a949da5bbd11480c59c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 1fc8c51705924d191e404692b5082c6a0dada200 Author: Wayne Davison way...@samba.org Date: Wed Dec 30 19:58:57 2009 -0800 Allow any gcc to make use of __builtin_alloca for alloca. commit b04604945d7d3868f3d914aa7e9ec0d00f8a974e Author: Wayne Davison way...@samba.org Date: Wed Dec 30 19:57:47 2009 -0800 Configure check for -Wno-unused-parameter now tries to link too. --- Summary of changes: configure.in |2 +- popt/system.h |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-37-g2f01fb1
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 2f01fb11526f4a8fed3e5e6189706845c04136f3 (commit) from ae358c1960a64dbdab82905e43594e7805488e56 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 2f01fb11526f4a8fed3e5e6189706845c04136f3 Author: Wayne Davison way...@samba.org Date: Thu Dec 24 08:31:37 2009 -0800 Preparing for release of 3.0.7pre2 --- Summary of changes: configure.in |2 +- packaging/lsb/rsync.spec |8 rsync.yo |4 ++-- rsyncd.conf.yo |4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-36-gae358c1
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via ae358c1960a64dbdab82905e43594e7805488e56 (commit) from 212dfdb960b387dce6496587eb559a6febbe4255 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit ae358c1960a64dbdab82905e43594e7805488e56 Author: Wayne Davison way...@samba.org Date: Wed Dec 23 11:31:28 2009 -0800 Revert to having the receiver handle timeouts on the receiving side. This will give 3.0.7 the standard timeout handling with just a few improvements: a fix for the detection of recent sender I/O, the use of MSG_DATA for really old rsync versions, and better setting of select_timeout for shorter timeout settings. --- Summary of changes: NEWS|7 +++ generator.c |7 +++ io.c| 37 ++--- rsync.h |2 +- 4 files changed, 29 insertions(+), 24 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-31-g96486cc
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 96486cc5340500590514b6922d32cb69145500f9 (commit) via e0b1b82d84bb39d03387a3c54d5955353c128cf2 (commit) from d94b958400f3b0737df489caa3c536f6d7d97393 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 96486cc5340500590514b6922d32cb69145500f9 Author: Wayne Davison way...@samba.org Date: Mon Dec 21 10:25:15 2009 -0800 Mention latest --timeout fixes. commit e0b1b82d84bb39d03387a3c54d5955353c128cf2 Author: Wayne Davison way...@samba.org Date: Mon Dec 21 10:13:52 2009 -0800 Don't die if inflate() returns Z_BUF_ERROR in see_deflate_token(). --- Summary of changes: NEWS|6 -- token.c |2 +- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-34-gc11a778
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via c11a77894b1284a05650d6f89d4e838c36945593 (commit) via 96cce18ce67f132a851c4e37b03fd09b8683233a (commit) from a21264a8b9edff20b561807754c3c7643929b4b8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit c11a77894b1284a05650d6f89d4e838c36945593 Author: Wayne Davison way...@samba.org Date: Mon Dec 21 14:27:55 2009 -0800 Ensure that the generator gets notified about an I/O error for the dir that generated the error. This ensures that a --delete-during avoids deleting in a newly transferred inc-recurse directory. Requires 3.0.7 or greater on both sides of the transfer. commit 96cce18ce67f132a851c4e37b03fd09b8683233a Author: Wayne Davison way...@samba.org Date: Mon Dec 21 13:48:44 2009 -0800 Defer forwarding messages during the forwarding of flist data. --- Summary of changes: NEWS |4 compat.c |5 + flist.c | 52 +++- io.c |4 +++- options.c |1 + rsync.h |1 + 6 files changed, 61 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-29-gd94b958
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via d94b958400f3b0737df489caa3c536f6d7d97393 (commit) from 79731940bba278082806578b7f4778961c100361 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit d94b958400f3b0737df489caa3c536f6d7d97393 Author: Wayne Davison way...@samba.org Date: Sat Dec 19 13:38:25 2009 -0800 Improve --timeout method to take into account all socket I/O that is going on. The receiving side also switches timeout handling from the receiver to the generator. Given this setup, all keep-alive messages are now sent as empty MSG_DATA messages, with MSG_NOOP messages only being understood and (when necessary) acted upon to forward a keep-alive event to an older receiver. This is both safer and more compatible with older versions. --- Summary of changes: generator.c |8 +-- io.c| 70 -- main.c |1 - rsync.c |6 +--- rsync.h |4 +- 5 files changed, 44 insertions(+), 45 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-27-gbdc038f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via bdc038fce0ae9f0cb83b579608e3a244703f8cc7 (commit) from 2eacba9c41238f8e52ed52791b9dda90d5807f45 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit bdc038fce0ae9f0cb83b579608e3a244703f8cc7 Author: Wayne Davison way...@samba.org Date: Wed Dec 16 13:32:03 2009 -0800 Use 0-length MSG_DATA when MSG_NOOP is not available (is both safer and supports older rsyncs). --- Summary of changes: NEWS | 10 +- io.c |8 ++-- 2 files changed, 11 insertions(+), 7 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-26-g2eacba9
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 2eacba9c41238f8e52ed52791b9dda90d5807f45 (commit) from 0c5853c32edd107738985297985e3b6e626e13d5 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 2eacba9c41238f8e52ed52791b9dda90d5807f45 Author: Wayne Davison way...@samba.org Date: Sun Dec 13 18:15:09 2009 -0800 Avoid -u option to id since solaris doesn't support it. --- Summary of changes: testsuite/chown.test |2 +- testsuite/daemon.test |2 +- testsuite/devices.test |2 +- testsuite/rsync.fns|4 4 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-23-g018dc6f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 018dc6f9988af454866cc9c01e851f132ace4daf (commit) via 523dad4bb3f75e4e313aa2a8d08a98028b1d7a52 (commit) via e0c17aa3b77d9865f86d15108ed4459dc877261c (commit) via 79870bd26937a88f05a277403924dadcf6b95fe0 (commit) via e4368e37fe34c70e99542e3aed6f1328672c3bcb (commit) via eee529f571be4eefc33edacb3182c42cb296d3cc (commit) via ff4715a7c2c97914466358d2cee5fb4b1c7a3d5b (commit) via 855983b43405ee06c90a7603bdb7838ffeb75aa6 (commit) via 2455140b04f53a9c9e5c22b86fc67128fd46bc93 (commit) via ae4d4205e329f4d4f396a1b7b1dfb50aee084c6e (commit) via 9523670032220d9159c03f3e0e27e5050a70aa07 (commit) via 01e57e926cf84827d8870c79f3f6863dd10e5ed0 (commit) via ebbab3788faac02d8eb8d34170c9188694d52ab7 (commit) via d041c17c40a9c2c6c8c6a0d15d018c0fd6beecf5 (commit) via b2b1af40c2cb1fa4e136d9b52431e040af38d585 (commit) via c5759a2817163d70a02644ecda0c59f666ab33e1 (commit) via 5ef08b8c3941e6c21bc79f23353045b5c32fb59a (commit) via 03f907e3866abdfab87a5dbdb0a2269873eff659 (commit) via 573e24346c3cea10acb86a60fba110daf09f03e5 (commit) via a415379037efc8390558594d2291a154d22ad999 (commit) via cc4edc2d7896bb8d27994eccf4d727f8b43eb3f5 (commit) via 07bd6618b9f9bb2d8797e6b42aacb611b1f4f097 (commit) from 2daed024b17a2cafb956e12581c25119d07a5950 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 018dc6f9988af454866cc9c01e851f132ace4daf Author: Wayne Davison way...@samba.org Date: Sat Dec 12 17:05:03 2009 -0800 Mention the newly cherry-picked changes. commit 523dad4bb3f75e4e313aa2a8d08a98028b1d7a52 Author: Wayne Davison way...@samba.org Date: Sat Dec 12 16:43:13 2009 -0800 Use seteuid() (if available) when using setuid(). commit e0c17aa3b77d9865f86d15108ed4459dc877261c Author: Wayne Davison way...@samba.org Date: Sat Dec 12 16:20:54 2009 -0800 Beginning work on a 3.0.7 release. commit 79870bd26937a88f05a277403924dadcf6b95fe0 Author: Wayne Davison way...@samba.org Date: Sat Nov 28 21:46:42 2009 -0800 Don't (wrongly) retouch dir permissions with --fake-super. (Patch from Matt.) commit e4368e37fe34c70e99542e3aed6f1328672c3bcb Author: Wayne Davison way...@samba.org Date: Thu Nov 26 15:17:49 2009 -0800 Add IPv6 detection on cygwin. commit eee529f571be4eefc33edacb3182c42cb296d3cc Author: Wayne Davison way...@samba.org Date: Sun Nov 8 00:12:33 2009 -0800 Save first filename and linenum in case exit_cleanup() recurses. commit ff4715a7c2c97914466358d2cee5fb4b1c7a3d5b Author: Wayne Davison way...@samba.org Date: Sat Oct 24 00:23:21 2009 -0700 Moved some --iconv text that was supposed to be in --files-from. commit 855983b43405ee06c90a7603bdb7838ffeb75aa6 Author: Wayne Davison way...@samba.org Date: Tue Oct 20 15:05:15 2009 -0700 Make sure daemon's io_timeout is used as a maximum value. commit 2455140b04f53a9c9e5c22b86fc67128fd46bc93 Author: Wayne Davison way...@samba.org Date: Sat Oct 17 11:06:49 2009 -0700 Fix some man page problems Scott Kostyshak pointed out. commit ae4d4205e329f4d4f396a1b7b1dfb50aee084c6e Author: Wayne Davison way...@samba.org Date: Tue Oct 13 21:07:46 2009 -0700 Avoid type-punned compiler warnings for the byteorder.h macros by using inline functions for the 4-char - uint32 conversions. commit 9523670032220d9159c03f3e0e27e5050a70aa07 Author: Wayne Davison way...@samba.org Date: Mon Sep 7 14:22:59 2009 -0700 Improve the --delete does not work without -r or -d message. commit 01e57e926cf84827d8870c79f3f6863dd10e5ed0 Author: Wayne Davison way...@samba.org Date: Sat Sep 5 10:25:42 2009 -0700 Improve error handling and get rid of a lingering fprintf(). commit ebbab3788faac02d8eb8d34170c9188694d52ab7 Author: Wayne Davison way...@samba.org Date: Sat Sep 5 09:40:53 2009 -0700 Fix daemon's conveyance of io_error value from sender. commit d041c17c40a9c2c6c8c6a0d15d018c0fd6beecf5 Author: Wayne Davison way...@samba.org Date: Sat Sep 5 08:16:22 2009 -0700 Avoid an dry-run error trying to stat a prior hard-link file that hasn't really been created. commit b2b1af40c2cb1fa4e136d9b52431e040af38d585 Author: Wayne Davison way...@samba.org Date: Wed Sep 2 08:52:41 2009 -0700 Rebuild proto.h if config.h changes. commit c5759a2817163d70a02644ecda0c59f666ab33e1 Author: Wayne Davison way...@samba.org Date: Sat Aug 22 09:33:55 2009 -0700 Fix the chmod-temp-dir test if /var/tmp doesn't exist. Fixes bug 6569. commit
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-25-g0c5853c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 0c5853c32edd107738985297985e3b6e626e13d5 (commit) via 3baa4d2b3123ece2aca52a8517536dab88fa5dbd (commit) from 018dc6f9988af454866cc9c01e851f132ace4daf (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 0c5853c32edd107738985297985e3b6e626e13d5 Author: Wayne Davison way...@samba.org Date: Sat Dec 12 22:43:51 2009 -0800 Get rid of some unused externs. commit 3baa4d2b3123ece2aca52a8517536dab88fa5dbd Author: Wayne Davison way...@samba.org Date: Sat Dec 12 22:42:35 2009 -0800 Include info on who is exiting. --- Summary of changes: cleanup.c | 10 +- clientserver.c |2 -- flist.c|1 - 3 files changed, 5 insertions(+), 8 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6-1-g2daed02
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 2daed024b17a2cafb956e12581c25119d07a5950 (commit) from 6622816efff2d6634ac5e1e4b45d9f23dffbf03f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 2daed024b17a2cafb956e12581c25119d07a5950 Author: Wayne Davison way...@samba.org Date: Fri Aug 14 07:04:24 2009 -0700 Fix a bogus free in uncache_tmp_xattrs(). --- Summary of changes: xattrs.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6pre1-6-g6622816
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 6622816efff2d6634ac5e1e4b45d9f23dffbf03f (commit) from 3f137ce0e20e0c20ad9fd1ccc30a2ade2da9b470 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 6622816efff2d6634ac5e1e4b45d9f23dffbf03f Author: Wayne Davison way...@samba.org Date: Fri May 8 10:07:14 2009 -0700 Preparing for release of 3.0.6 --- Summary of changes: NEWS |2 +- OLDNEWS |2 +- configure.in |2 +- packaging/lsb/rsync.spec | 10 +- rsync.yo |4 ++-- rsyncd.conf.yo |4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6pre1-5-g3f137ce
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 3f137ce0e20e0c20ad9fd1ccc30a2ade2da9b470 (commit) via d616bff57ffb79f990aaf277946390675a218267 (commit) from 40b3a59fc836de5319826bb4793060fafdba12d7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 3f137ce0e20e0c20ad9fd1ccc30a2ade2da9b470 Author: Wayne Davison way...@samba.org Date: Thu May 7 08:02:17 2009 -0700 Fix typo pointed out by Chris Pepper. commit d616bff57ffb79f990aaf277946390675a218267 Author: Matt McCutchen m...@mattmccutchen.net Date: Mon May 4 22:30:47 2009 -0400 Move the description of include/exclude modifiers to a better place in the man page. --- Summary of changes: rsync.yo | 70 +++--- 1 files changed, 35 insertions(+), 35 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6pre1-3-g40b3a59
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 40b3a59fc836de5319826bb4793060fafdba12d7 (commit) from 4640ae85fe8b35d3410b319f532e3ad9ff7eac79 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 40b3a59fc836de5319826bb4793060fafdba12d7 Author: Wayne Davison way...@samba.org Date: Mon Apr 27 07:21:56 2009 -0700 Clarify which options are transfer rules, and what that means. --- Summary of changes: rsync.yo | 27 --- 1 files changed, 24 insertions(+), 3 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6pre1-2-g4640ae8
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 4640ae85fe8b35d3410b319f532e3ad9ff7eac79 (commit) from 24f739c11845b467175e75f5d15a2645af0bb473 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 4640ae85fe8b35d3410b319f532e3ad9ff7eac79 Author: Wayne Davison way...@samba.org Date: Sun Apr 26 07:49:00 2009 -0700 Change sending/receiving/storing of the rdev value for special files. Since the value is not needed, the (superfluous) sending of the value is optimized so that a valid rdev value is sent as efficiently as possible. The receiver no longer caches an rdev value for special files, and the generator will always pass a 0 rdev value to do_mknod() for special files. Fixes bug #6280. --- Summary of changes: NEWS|2 ++ flist.c | 28 +++- generator.c | 12 xattrs.c|4 ++-- 4 files changed, 31 insertions(+), 15 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.6pre1-1-g24f739c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 24f739c11845b467175e75f5d15a2645af0bb473 (commit) from 996824825f403c2ddb9ae95d99679052896ce59a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 24f739c11845b467175e75f5d15a2645af0bb473 Author: Wayne Davison way...@samba.org Date: Mon Apr 13 07:42:20 2009 -0700 Clarify the read-batch fix. --- Summary of changes: NEWS |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-30-gfeb8dac
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via feb8dacc148d5428be2498e5748ef9aa2ea889a2 (commit) from ff908116efefc0c8926e2ce419e5de566201646a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit feb8dacc148d5428be2498e5748ef9aa2ea889a2 Author: Wayne Davison way...@samba.org Date: Sun Apr 12 12:48:59 2009 -0700 Fixed the use of --xattrs with --only-write-batch. --- Summary of changes: NEWS|2 ++ generator.c |2 +- receiver.c |4 ++-- sender.c|5 ++--- 4 files changed, 7 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-31-g9be5093
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 9be5093726d73826b63f18435940bbe1afddc66c (commit) from feb8dacc148d5428be2498e5748ef9aa2ea889a2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 9be5093726d73826b63f18435940bbe1afddc66c Author: Wayne Davison way...@samba.org Date: Sun Apr 12 12:57:31 2009 -0700 Don't allow --remove-s*-files with --read-batch. --- Summary of changes: NEWS |3 +++ options.c |6 ++ 2 files changed, 9 insertions(+), 0 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-33-g9968248
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 996824825f403c2ddb9ae95d99679052896ce59a (commit) via bbef6566cd2fb9f12a52f6c61d27efe84695f2c6 (commit) from 9be5093726d73826b63f18435940bbe1afddc66c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 996824825f403c2ddb9ae95d99679052896ce59a Author: Wayne Davison way...@samba.org Date: Sun Apr 12 15:28:34 2009 -0700 Preparing for release of 3.0.6pre1 commit bbef6566cd2fb9f12a52f6c61d27efe84695f2c6 Author: Wayne Davison way...@samba.org Date: Sun Apr 12 15:18:33 2009 -0700 Changed the commands used to make gen without any stoppage. --- Summary of changes: configure.in |2 +- packaging/lsb/rsync.spec | 12 ++-- packaging/patch-update |5 +++-- rsync.yo |4 ++-- rsyncd.conf.yo |4 ++-- 5 files changed, 14 insertions(+), 13 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-28-gea53d16
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via ea53d161be54a474088df51063df128ff5da5af4 (commit) from 7875e6fe63805a3412cb4a8673a2dbf233631110 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit ea53d161be54a474088df51063df128ff5da5af4 Author: Wayne Davison way...@samba.org Date: Fri Apr 10 16:09:39 2009 -0700 Fixed an ACL/xattr corruption issue where the --backup option could cause rsync to associate the wrong ACL/xattr information with received files. --- Summary of changes: NEWS |3 +++ acls.c | 38 +- backup.c | 32 xattrs.c | 21 - 4 files changed, 88 insertions(+), 6 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-29-gff90811
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via ff908116efefc0c8926e2ce419e5de566201646a (commit) from ea53d161be54a474088df51063df128ff5da5af4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit ff908116efefc0c8926e2ce419e5de566201646a Author: Wayne Davison way...@samba.org Date: Fri Apr 10 16:24:12 2009 -0700 Allow a make reconfigure to continue, even if the Makefile changes. --- Summary of changes: Makefile.in |8 ++-- 1 files changed, 6 insertions(+), 2 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-27-g7875e6f
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 7875e6fe63805a3412cb4a8673a2dbf233631110 (commit) from 8e2771aa6e1fe242c0ad2919d2721e800d505d8e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 7875e6fe63805a3412cb4a8673a2dbf233631110 Author: Wayne Davison way...@samba.org Date: Thu Apr 9 22:49:24 2009 -0700 Don't try to simplify an ACL that has a mask w/o any named values. --- Summary of changes: NEWS |2 ++ acls.c | 12 +++- 2 files changed, 5 insertions(+), 9 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-26-g8e2771a
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 8e2771aa6e1fe242c0ad2919d2721e800d505d8e (commit) from 386f22cec6dbb375490eaca187486557fadda48b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 8e2771aa6e1fe242c0ad2919d2721e800d505d8e Author: Wayne Davison way...@samba.org Date: Tue Apr 7 07:32:35 2009 -0700 Some improvements to the rsync.yo manpage: - Mention the switch from MD4 to MD5. - Mention the default for the --log-file-format option. --- Summary of changes: rsync.yo | 12 +--- 1 files changed, 9 insertions(+), 3 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-25-g386f22c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 386f22cec6dbb375490eaca187486557fadda48b (commit) via 272adea36b1cc56b1167b173c87c725e866d2e5d (commit) from a69b165524dfc576840f6ad4a9d0963bd8ed9578 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 386f22cec6dbb375490eaca187486557fadda48b Author: Wayne Davison way...@samba.org Date: Sat Apr 4 07:44:00 2009 -0700 Make sure that config.h.in is up-to-date before allowing the Makefile-updating rule to run ./config.status. commit 272adea36b1cc56b1167b173c87c725e866d2e5d Author: Wayne Davison way...@samba.org Date: Sat Apr 4 07:37:51 2009 -0700 Fixed --dry-run with --read-batch: - Avoid sending MSG_NO_SEND to the generator. - Check if the file is wanted before discarding the batched data. --- Summary of changes: Makefile.in |8 ++-- NEWS|2 ++ receiver.c | 29 - 3 files changed, 20 insertions(+), 19 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-22-gbf350d7
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via bf350d7b314714b82b1fe386af08c1a1a70b2b75 (commit) from 70a9cd575287e91ab20addf7e3e2988354e4e3c9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit bf350d7b314714b82b1fe386af08c1a1a70b2b75 Author: Wayne Davison way...@samba.org Date: Tue Mar 31 14:34:31 2009 -0700 Fixed a word ending that Jesse Weinstein and revamp some of the text to make it clearer. --- Summary of changes: rsync.yo | 29 ++--- 1 files changed, 14 insertions(+), 15 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
[SCM] The rsync repository. branch, b3.0.x, updated. v3.0.5-21-g70a9cd5
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project The rsync repository.. The branch, b3.0.x has been updated via 70a9cd575287e91ab20addf7e3e2988354e4e3c9 (commit) from 42560e2e53cf9ee88da805c594b3074cec5e6471 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - commit 70a9cd575287e91ab20addf7e3e2988354e4e3c9 Author: Wayne Davison way...@samba.org Date: Sun Mar 29 13:23:56 2009 -0700 Make symlink iconv work for a local copy. Fixes issue mention in bug #5615. --- Summary of changes: NEWS |2 ++ compat.c |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) hooks/post-receive -- The rsync repository. ___ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs
