summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorMartin Basti <mbasti@redhat.com>2016-10-31 10:27:24 +0100
committerJan Cholasta <jcholast@redhat.com>2016-11-11 12:13:56 +0100
commit83fe6b626fd2fb7f43ddf3568aaffca1ce569079 (patch)
tree6b8b854fe63cd81d89f5a2a92a3e6b266f08732b /client
parentfcea3b3fb88ede0e9414f83ac2372e000e728587 (diff)
downloadfreeipa-83fe6b626fd2fb7f43ddf3568aaffca1ce569079.tar.gz
freeipa-83fe6b626fd2fb7f43ddf3568aaffca1ce569079.tar.xz
freeipa-83fe6b626fd2fb7f43ddf3568aaffca1ce569079.zip
client: move custom env variable into client module
There is no need to have env as parameter because this is used only once, so it can eb safely moved to client.py module NOTE: PATH should be overwritten to safe values before we execute any command https://www.securecoding.cert.org/confluence/display/c/ENV03-C.+Sanitize+the+environment+when+invoking+external+programs https://fedorahosted.org/freeipa/ticket/6392 Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'client')
-rwxr-xr-xclient/ipa-client-install8
1 files changed, 3 insertions, 5 deletions
diff --git a/client/ipa-client-install b/client/ipa-client-install
index a5c84a895..fe8f071e0 100755
--- a/client/ipa-client-install
+++ b/client/ipa-client-install
@@ -229,20 +229,18 @@ def main():
root_logger.debug("missing options might be asked for interactively later")
root_logger.debug('IPA version %s' % version.VENDOR_VERSION)
- env={"PATH":"/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"}
-
if options.uninstall:
rval_check = client.uninstall_check(options)
if rval_check != client.SUCCESS:
return rval_check
- return client.uninstall(options, env)
+ return client.uninstall(options)
rval_check = client.install_check(options)
if rval_check != client.SUCCESS:
return rval_check
- rval = client.install(options, env)
+ rval = client.install(options)
if rval == client.CLIENT_INSTALL_ERROR:
if options.force:
root_logger.warning(
@@ -255,7 +253,7 @@ def main():
else:
root_logger.error("Installation failed. Rolling back changes.")
options.unattended = True
- client.uninstall(options, env)
+ client.uninstall(options)
return rval