Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enhance --chmod to allow octal values.
[rsync/rsync.git]
/
testsuite
/
rsync.fns
diff --git
a/testsuite/rsync.fns
b/testsuite/rsync.fns
index
b58bd0d
..
649039d
100644
(file)
--- a/
testsuite/rsync.fns
+++ b/
testsuite/rsync.fns
@@
-99,6
+99,10
@@
rsync_ls_lR() {
find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
}
find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
}
+get_testuid() {
+ id 2>/dev/null | sed 's/^[^0-9]*\([0-9][0-9]*\).*/\1/'
+}
+
check_perms() {
perms=`"$TOOLDIR/tls" "$1" | sed 's/^[-d]\(.........\).*/\1/'`
if test $perms = $2; then
check_perms() {
perms=`"$TOOLDIR/tls" "$1" | sed 's/^[-d]\(.........\).*/\1/'`
if test $perms = $2; then
@@
-258,7
+262,7
@@
build_rsyncd_conf() {
uid_setting='uid = 0'
gid_setting='gid = 0'
uid_setting='uid = 0'
gid_setting='gid = 0'
- case `
id -u
` in
+ case `
get_testuid
` in
0) ;;
*)
# Non-root cannot specify uid & gid settings
0) ;;
*)
# Non-root cannot specify uid & gid settings