X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/aa381148a3b7fcf0772ea587e3d7969bd637dfcc..0f6b683c8ebf2a26988909c46a31543a5fb17302:/testsuite/rsync.fns diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index b58bd0db..649039dc 100644 --- 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 } +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 @@ -258,7 +262,7 @@ build_rsyncd_conf() { uid_setting='uid = 0' gid_setting='gid = 0' - case `id -u` in + case `get_testuid` in 0) ;; *) # Non-root cannot specify uid & gid settings