From 000ba0531e2c650d337966790604e4600e814436 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Tue, 26 Apr 2011 15:51:34 -0400
Subject: ipautil: Preserve environment unless explicitly overridden by caller.

Fixes: https://fedorahosted.org/freeipa/ticket/1193
---
 ipapython/ipautil.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'ipapython/ipautil.py')

diff --git a/ipapython/ipautil.py b/ipapython/ipautil.py
index 81719ccae..b5a0b9105 100644
--- a/ipapython/ipautil.py
+++ b/ipapython/ipautil.py
@@ -28,6 +28,7 @@ import logging
 import subprocess
 import random
 import os, sys, traceback, readline
+import copy
 import stat
 import shutil
 import urllib2
@@ -119,7 +120,9 @@ def run(args, stdin=None, raiseonerr=True,
     p_err = None
 
     if env is None:
-        env={"PATH": "/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"}
+        # copy default env
+        env = copy.deepcopy(os.environ)
+        env["PATH"] = "/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"
     if stdin:
         p_in = subprocess.PIPE
     if capture_output:
-- 
cgit