Commit e10872da authored by Mike Hibler's avatar Mike Hibler

Allow /tmp/php* as well as /var/tmp/php*.

This shows up on FBSD 10.x based elabs that use one big FS for
/, /var, /usr since realpath(/var/tmp/...) resolves to /tmp/...
Originally noticed by Jeff Bowles at NMC, but I didn't make the fix
til it bit me on the ass in APT!
parent 67945bfa
#!/usr/bin/perl -wT
#
# Copyright (c) 2000-2013 University of Utah and the Flux Group.
# Copyright (c) 2000-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -1027,6 +1027,7 @@ sub ParseArgs()
#
if (! ($tempnsfile =~ /^\/tmp\/[-\w]+-\d+\.nsfile/) &&
! ($tempnsfile =~ /^\/tmp\/\d+\.ns/) &&
! ($tempnsfile =~ /^\/tmp\/php[-\w]+/) &&
! ($tempnsfile =~ /^\/var\/tmp\/php[-\w]+/) &&
! TBValidUserDir($tempnsfile, $ISFS)) {
tberror({type => 'primary', severity => SEV_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment