diff options
| -rwxr-xr-x | install/tools/ipa-adtrust-install | 9 | ||||
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 48 |
2 files changed, 55 insertions, 2 deletions
diff --git a/install/tools/ipa-adtrust-install b/install/tools/ipa-adtrust-install index 49bcf54e7..3cff046c4 100755 --- a/install/tools/ipa-adtrust-install +++ b/install/tools/ipa-adtrust-install @@ -48,6 +48,12 @@ def parse_options(): parser.add_option("--no-msdcs", dest="no_msdcs", action="store_true", default=False, help="Do not create DNS service records " \ "for Windows in managed DNS server") + parser.add_option("--rid-base", dest="rid_base", type=int, default=1000, + help="Start value for mapping UIDs and GIDs to RIDs") + parser.add_option("--secondary-rid-base", dest="secondary_rid_base", + type=int, default=100000000, + help="Start value of the secondary range for mapping " \ + "UIDs and GIDs to RIDs") parser.add_option("-U", "--unattended", dest="unattended", action="store_true", default=False, help="unattended installation never prompts the user") @@ -207,7 +213,8 @@ def main(): api.Backend.ldap2.connect(ccache) smb.setup(api.env.host, ip_address, api.env.realm, api.env.domain, - netbios_name, options.no_msdcs) + netbios_name, options.rid_base, options.secondary_rid_base, + options.no_msdcs) smb.create_instance() print """ diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 3e3c433bf..ab2f163ef 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -114,6 +114,8 @@ class ADTRUSTInstance(service.Service): self.cifs_principal = None self.cifs_agent = None self.selinux_booleans = None + self.rid_base = None + self.secondary_rid_base = None service.Service.__init__(self, "smb", dm_password=dm_password) @@ -174,6 +176,47 @@ class ADTRUSTInstance(service.Service): except: print "Failed to modify IPA admin group object" + def __add_rid_bases(self): + """ + Add RID bases to the range object for the local ID range. + + TODO: handle missing or multiple ranges more gracefully. + """ + + try: + res = self.admin_conn.search_s("cn=ranges,cn=etc,"+self.suffix, + ldap.SCOPE_ONELEVEL, + "(objectclass=ipaDomainIDRange)") + if len(res) != 1: + root_logger.critical("Found more than one ID range for the " \ + "local domain.") + raise RuntimeError("Too many ID ranges\n") + + if res[0].getValue('ipaBaseRID') or \ + res[0].getValue('ipaSecondaryBaseRID'): + print "RID bases already set, nothing to do" + return + + size = res[0].getValue('ipaIDRangeSize') + if abs(self.rid_base - self.secondary_rid_base) > size: + print "Primary and secondary RID base are too close. " \ + "They have to differ at least by %d." % size + raise RuntimeError("RID bases too close.\n") + + try: + self.admin_conn.modify_s(res[0].dn, + [(ldap.MOD_ADD, "ipaBaseRID", \ + str(self.rid_base)), \ + (ldap.MOD_ADD, "ipaSecondaryBaseRID", \ + str(self.secondary_rid_base))]) + except: + print "Failed to add RID bases to the local range object" + + except errors.NotFound as e: + root_logger.critical("ID range of the local domain not found, " \ + "define it and run again.") + raise e + def __create_samba_domain_object(self): try: @@ -409,12 +452,14 @@ class ADTRUSTInstance(service.Service): FQDN = self.fqdn) def setup(self, fqdn, ip_address, realm_name, domain_name, netbios_name, - no_msdcs=False, smbd_user="samba"): + rid_base, secondary_rid_base, no_msdcs=False, smbd_user="samba"): self.fqdn = fqdn self.ip_address = ip_address self.realm_name = realm_name self.domain_name = domain_name self.netbios_name = netbios_name + self.rid_base = rid_base + self.secondary_rid_base = secondary_rid_base self.no_msdcs = no_msdcs self.smbd_user = smbd_user self.suffix = ipautil.realm_to_suffix(self.realm_name) @@ -447,6 +492,7 @@ class ADTRUSTInstance(service.Service): self.step("writing samba config file", self.__write_smb_conf) self.step("adding cifs Kerberos principal", self.__setup_principal) self.step("adding admin(group) SIDs", self.__add_admin_sids) + self.step("adding RID bases", self.__add_rid_bases) self.step("activating CLDAP plugin", self.__add_cldap_module) self.step("activating extdom plugin", self.__add_extdom_module) self.step("activating sidgen plugin and task", self.__add_sidgen_module) |