diff options
| author |   ajacoutot <ajacoutot@openbsd.org> | 2008-06-09 23:57:58 +0000 |
|---|---|---|
| committer | ajacoutot <ajacoutot@openbsd.org> | 2008-06-09 23:57:58 +0000 |
| commit | 5f848e43b860b7e72381f0553255f62e66f15231 (patch) | |
| tree | 83fe1e174beac117a096c981e95e7e331237d55e | |
| parent | unused var (diff) | |
| download | wireguard-openbsd-5f848e43b860b7e72381f0553255f62e66f15231.tar.xz wireguard-openbsd-5f848e43b860b7e72381f0553255f62e66f15231.zip | |
- add a sanity check on tarballs name to ensure we're not feeding
sysmerge with unrelated sets
ok sthen@ pyr@ jdixon@
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index 0c595c094bb..829fda2482f 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: sysmerge.sh,v 1.10 2008/06/08 21:54:25 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.11 2008/06/09 23:57:58 ajacoutot Exp $ # # This script is based on the FreeBSD mergemaster script, written by # Douglas Barton <DougB@FreeBSD.org> @@ -439,7 +439,7 @@ do shift 2 if [ -f "${WHERE}/etc/Makefile" ]; then SRCDIR=${WHERE} - elif [ -f "${WHERE}" ]; then + elif [ -f "${WHERE}" -a "`echo ${WHERE} | sed -e 's,.*\/,,g'`" = etc??.tgz ]; then TGZ=${WHERE} else echo " *** ERROR: ${WHERE} is not a path to src nor etcXX.tgz" @@ -449,7 +449,7 @@ do -x) WHERE="${2}" shift 2 - if [ -f "${WHERE}" ]; then + if [ -f "${WHERE}" -a "`echo ${WHERE} | sed -e 's,.*\/,,g'`" = xetc??.tgz ]; then XTGZ=${WHERE} else echo " *** ERROR: ${WHERE} is not a path to xetcXX.tgz" |