From ffd760c1002cfe6b27d140affa8e0608696d3668 Mon Sep 17 00:00:00 2001 From: Martin Kosek Date: Mon, 19 Sep 2011 18:37:27 +0200 Subject: Fix /usr/bin/ipa dupled server list Fix get_url_list() so that the configured master server is there just once. This fix lets /usr/bin/ipa try connecting to all IPA masters just once and not print confusing server list with dupled master. https://fedorahosted.org/freeipa/ticket/1817 --- ipalib/rpc.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'ipalib/rpc.py') diff --git a/ipalib/rpc.py b/ipalib/rpc.py index d667df71e..5491b28da 100644 --- a/ipalib/rpc.py +++ b/ipalib/rpc.py @@ -325,7 +325,15 @@ class xmlclient(Connectible): servers = list(set(servers)) # the list/set conversion won't preserve order so stick in the # local config file version here. - servers.insert(0, self.env.xmlrpc_uri) + cfg_server = self.env.xmlrpc_uri + if cfg_server in servers: + # make sure the configured master server is there just once and + # it is the first one + servers.remove(cfg_server) + servers.insert(0, cfg_server) + else: + servers.insert(0, cfg_server) + return servers def create_connection(self, ccache=None, verbose=False, fallback=True): -- cgit