diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-01-21 07:40:42 -0500 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-03-01 16:59:45 +0100 |
| commit | f5c404c65d81d9a28f171fabe7c5749d6c37f102 (patch) | |
| tree | 2144594e18108034898baf93780e37eb8bbe6027 /ipaserver/install/adtrustinstance.py | |
| parent | 66eaf1220da3e3fccd54b8f6a54f7d116818b024 (diff) | |
| download | freeipa-f5c404c65d81d9a28f171fabe7c5749d6c37f102.tar.gz freeipa-f5c404c65d81d9a28f171fabe7c5749d6c37f102.tar.xz freeipa-f5c404c65d81d9a28f171fabe7c5749d6c37f102.zip | |
Replace entry.getValue by entry.single_value
Part of the work for: https://fedorahosted.org/freeipa/ticket/2660
Diffstat (limited to 'ipaserver/install/adtrustinstance.py')
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 9cc533b96..52534c19c 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -164,7 +164,7 @@ class ADTRUSTInstance(service.Service): self.print_msg("Samba domain object not found") return - dom_sid = dom_entry.getValue(self.ATTR_SID) + dom_sid = dom_entry.single_value(self.ATTR_SID, None) if not dom_sid: self.print_msg("Samba domain object does not have a SID") return @@ -182,7 +182,7 @@ class ADTRUSTInstance(service.Service): self.print_msg("IPA admin group object not found") return - if admin_entry.getValue(self.ATTR_SID): + if admin_entry.single_value(self.ATTR_SID, None): self.print_msg("Admin SID already set, nothing to do") else: try: @@ -192,7 +192,7 @@ class ADTRUSTInstance(service.Service): except: self.print_msg("Failed to modify IPA admin object") - if admin_group_entry.getValue(self.ATTR_SID): + if admin_group_entry.single_value(self.ATTR_SID, None): self.print_msg("Admin group SID already set, nothing to do") else: try: @@ -224,7 +224,7 @@ class ADTRUSTInstance(service.Service): self.print_msg("Samba domain object not found") return - if dom_entry.getValue(self.ATTR_FALLBACK_GROUP): + if dom_entry.single_value(self.ATTR_FALLBACK_GROUP, None): self.print_msg("Fallback group already set, nothing to do") return @@ -269,12 +269,12 @@ class ADTRUSTInstance(service.Service): "local domain.") raise RuntimeError("Too many ID ranges\n") - if res[0].getValue('ipaBaseRID') or \ - res[0].getValue('ipaSecondaryBaseRID'): + if res[0].single_value('ipaBaseRID', None) or \ + res[0].single_value('ipaSecondaryBaseRID', None): self.print_msg("RID bases already set, nothing to do") return - size = res[0].getValue('ipaIDRangeSize') + size = res[0].single_value('ipaIDRangeSize', None) if abs(self.rid_base - self.secondary_rid_base) > size: self.print_msg("Primary and secondary RID base are too close. " \ "They have to differ at least by %d." % size) @@ -719,7 +719,7 @@ class ADTRUSTInstance(service.Service): raise ValueError("No local ID range and no admins group found.\n" \ "Add local ID range manually and try again!") - base_id = int(entry.getValue('gidNumber')) + base_id = int(entry.single_value('gidNumber')) id_range_size = 200000 id_filter = "(&" \ |