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/cmdline.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/cmdline.py')
| -rw-r--r-- | sshuttle/cmdline.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sshuttle/cmdline.py b/sshuttle/cmdline.py index 65e59bf..3f0dfb4 100644 --- a/sshuttle/cmdline.py +++ b/sshuttle/cmdline.py @@ -26,7 +26,7 @@ def main(): elif opt.hostwatch: return hostwatch.hw_main(opt.subnets) else: - includes = opt.subnets_from_file or opt.subnets + includes = opt.subnets excludes = opt.exclude if not includes and not opt.auto_nets: parser.error('at least one subnet, subnet file, or -N expected') |