summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Nagy <mnagy@redhat.com>2008-09-09 13:57:55 +0200
committerMartin Nagy <mnagy@redhat.com>2008-09-11 23:34:01 +0200
commita9e8a72059ca5a6db13a9835d20f68dd16ce9a7a (patch)
tree4a5f54f79eee1ff8ddf0800435019980c6fe4d18
parent7206a6d43c0b23e2a5e723351a7a1f3215c158ae (diff)
downloadfreeipa-a9e8a72059ca5a6db13a9835d20f68dd16ce9a7a.tar.gz
freeipa-a9e8a72059ca5a6db13a9835d20f68dd16ce9a7a.tar.xz
freeipa-a9e8a72059ca5a6db13a9835d20f68dd16ce9a7a.zip
Try servers from ipa.conf even if we specified them on the command line.
-rw-r--r--ipa-python/config.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/ipa-python/config.py b/ipa-python/config.py
index 65ce30d9c..0cdf8addb 100644
--- a/ipa-python/config.py
+++ b/ipa-python/config.py
@@ -96,9 +96,8 @@ def __parse_config():
except:
pass
try:
- if not len(config.default_server):
- s = p.get("defaults", "server")
- config.default_server = re.sub("\s+", "", s).split(',')
+ s = p.get("defaults", "server")
+ config.default_server.extend(re.sub("\s+", "", s).split(','))
except:
pass
try: