diff options
| author | Tomas Babej <tbabej@redhat.com> | 2013-08-06 10:41:58 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-08-06 13:44:32 +0200 |
| commit | 8c8da71ea38c0082884c193c699a9f5d20b7e898 (patch) | |
| tree | d1f7be1ae0506eb5d845cd8aa612aff09c73bdce | |
| parent | 3bb6d3830868a50066569b55158fbba1f36654fd (diff) | |
| download | freeipa.git-8c8da71ea38c0082884c193c699a9f5d20b7e898.tar.gz freeipa.git-8c8da71ea38c0082884c193c699a9f5d20b7e898.tar.xz freeipa.git-8c8da71ea38c0082884c193c699a9f5d20b7e898.zip | |
Remove overlapping use-cases of the same result variable
| -rw-r--r-- | ipaserver/dcerpc.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index 3ef81a6d..4b87a9e8 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -781,18 +781,18 @@ class TrustDomainInstance(object): ldap_uri = 'ldap://%s' % (result.pdc_dns_name) conn = _ldap.initialize(ldap_uri) conn.set_option(_ldap.OPT_SERVER_CONTROLS, [ExtendedDNControl()]) - result = None + search_result = None try: (objtype, res) = conn.search_s('', _ldap.SCOPE_BASE)[0] - result = res['defaultNamingContext'][0] + search_result = res['defaultNamingContext'][0] self.info['dns_hostname'] = res['dnsHostName'][0] except _ldap.LDAPError, e: root_logger.error( "LDAP error when connecting to %(host)s: %(error)s" % dict(host=unicode(result.pdc_name), error=str(e))) - if result: - self.info['sid'] = self.parse_naming_context(result) + if search_result: + self.info['sid'] = self.parse_naming_context(search_result) return True def parse_naming_context(self, context): |