From e6ad0f676fe903deaaef5412525a8fd23cc7bb75 Mon Sep 17 00:00:00 2001 From: Stefan Midjich Date: Sun, 19 Nov 2017 00:45:24 +0100 Subject: [PATCH] fixing use_sudo argument --- portalclientlib/helpers.py | 2 +- tools/manage_client.py | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/portalclientlib/helpers.py b/portalclientlib/helpers.py index 4f5af3d..6cea0e1 100644 --- a/portalclientlib/helpers.py +++ b/portalclientlib/helpers.py @@ -3,7 +3,7 @@ import subprocess import shlex def run_ipset(command, *args, **kw): - use_sudo = kw.get('use_sudo', True) + use_sudo = kw.get('use_sudo', False) timeout = kw.get('timeout', 2) if use_sudo: diff --git a/tools/manage_client.py b/tools/manage_client.py index d905c35..83bd141 100644 --- a/tools/manage_client.py +++ b/tools/manage_client.py @@ -97,12 +97,12 @@ config.readfp(args.config) sr = StoragePostgres(config=config) -if args.refresh: - if getuid() == 0: - use_sudo = False - else: - use_sudo = True +if getuid() == 0: + use_sudo = False +else: + use_sudo = True +if args.refresh: # Sync clients and packet counters from ipset into storage. proc = run_ipset( 'list', @@ -201,7 +201,8 @@ for src_ip in args.src_ip: client = Client( storage=sr, ip_address=src_ip, - ipset_name=config.get('ipset', 'ipset_name') + ipset_name=config.get('ipset', 'ipset_name'), + use_sudo=use_sudo ) if args.delete: