embedaddon/rsync/testsuite/rsync.fns - diff

Return to rsync.fns CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / testsuite

Diff for /embedaddon/rsync/testsuite/rsync.fns between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30	version 1.1.1.2, 2013/10/14 07:51:15
Line 17	Line 17
# License along with this program; if not, write to the Free Software	# License along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.


tmpdir="$scratchdir"	tmpdir="$scratchdir"
fromdir="$tmpdir/from"	fromdir="$tmpdir/from"
todir="$tmpdir/to"	todir="$tmpdir/to"
Line 32 tab_ch=' ' # a single tab character	Line 31 tab_ch=' ' # a single tab character
# Berkley's nice.	# Berkley's nice.
PATH="$PATH:/usr/ucb"	PATH="$PATH:/usr/ucb"

if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then	if diff -u "$suitedir/rsync.fns" "$suitedir/rsync.fns" >/dev/null 2>&1; then
diffopt="-u"	diffopt="-u"
else	else
diffopt="-c"	diffopt="-c"
Line 263 build_rsyncd_conf() {	Line 262 build_rsyncd_conf() {
logfile="$scratchdir/rsyncd.log"	logfile="$scratchdir/rsyncd.log"
hostname=`uname -n`	hostname=`uname -n`

	uid_setting='uid = 0'
	gid_setting='gid = 0'
	case `get_testuid` in
	0) ;;
	*)
	# Non-root cannot specify uid & gid settings
	uid_setting="#$uid_setting"
	gid_setting="#$gid_setting"
	;;
	esac

cat >"$conf" <<EOF	cat >"$conf" <<EOF
# rsyncd configuration file autogenerated by $0	# rsyncd configuration file autogenerated by $0

Line 274 log file = $logfile	Line 284 log file = $logfile
log format = %i %h [%a] %m (%u) %l %f%L	log format = %i %h [%a] %m (%u) %l %f%L
transfer logging = yes	transfer logging = yes
exclude = ? foobar.baz	exclude = ? foobar.baz
max verbosity = 9	max verbosity = 4
uid = 0	$uid_setting
gid = 0	$gid_setting

[test-from]	[test-from]
path = $fromdir	path = $fromdir

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.1
changed lines
	Added in v.1.1.1.2