Commit a02f98b9 authored by Leigh Stoller's avatar Leigh Stoller

Merge branch 'mymaster'

parents 3706bd98 f7231615
/*
* Copyright (c) 2000-2013 University of Utah and the Flux Group.
* Copyright (c) 2000-2014 University of Utah and the Flux Group.
*
* {{{EMULAB-LICENSE
*
......@@ -121,7 +121,7 @@ static unsigned int ipod_hook_fn(unsigned int hooknum,struct sk_buff *skb,
static struct nf_hook_ops ipod_hook_ops = {
.hook = ipod_hook_fn,
.owner = THIS_MODULE,
.hooknum = NF_INET_PRE_ROUTING,
.hooknum = NF_INET_LOCAL_IN,
.pf = PF_INET,
.priority = NF_IP_PRI_FIRST,
};
......
#!/usr/bin/perl -wT
#!/usr/bin/perl -w
#
# Copyright (c) 2003-2012 University of Utah and the Flux Group.
# Copyright (c) 2003-2014 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -24,6 +24,7 @@
use English;
use Getopt::Std;
use BSD::Resource;
use File::Basename;
use POSIX qw(:signal_h);
use strict;
......@@ -124,17 +125,17 @@ if (!($localfile =~ /^([\w\.\_\-+\/]+)$/)) {
die("*** $0:\n".
" Illegal local filename given: $localfile\n");
} else {
$localfile = $1;
my $realpath = `$REALPATH $localfile`;
$localfile = $1;
my $dirname = dirname($localfile);
my $basename = basename($localfile);
my $realpath = `$REALPATH $dirname`;
chomp $realpath;
if (!TBValidUserDir($realpath, $ISFS)) {
die("*** $0:\n".
" Local file must be in one of " .
join(' or ', TBValidUserDirList()) . ".\n");
}
if ($realpath =~ /^([\w\.\_\-+\/]+)$/) {
$localfile = $1;
}
$localfile = "${realpath}/${basename}";
}
#
......
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