diff options
| author | vieira <vieira@yubo.be> | 2016-03-30 23:16:29 +0000 |
|---|---|---|
| committer | Brian May <brian@linuxpenguins.xyz> | 2016-03-31 11:46:12 +1100 |
| commit | 6e15e690295ee6d17d1ab64b85f0adebb7e3ac7a (patch) | |
| tree | 6d6dce42003009c3745de978de5881de9859313a /sshuttle/options.py | |
| parent | 8fa45885cc94102f3b17f5b9329ab6e4a8930c65 (diff) | |
Support multiple subnet files (multiple -s options)
When passing multiple subnet files, e.g., by using -s/--subnets
multiple times or by using it together with subnets passed as positional
arguments append the content from all sources instead of only using the
subnets from the last source. This makes the behaviour of -s/--subnets
consistent with -x/--exclude.
Diffstat (limited to 'sshuttle/options.py')
| -rw-r--r-- | sshuttle/options.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sshuttle/options.py b/sshuttle/options.py index 488cd0b..0b1aa47 100644 --- a/sshuttle/options.py +++ b/sshuttle/options.py @@ -268,7 +268,8 @@ parser.add_argument( parser.add_argument( "-s", "--subnets", metavar="PATH", - dest="subnets_from_file", + action=Concat, + dest="subnets", type=parse_subnet_file, help=""" file where the subnets are stored, instead of on the command line |