diff options
| author | Sumit Bose <sbose@redhat.com> | 2012-10-02 22:11:17 +0200 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2012-10-04 22:15:36 -0400 |
| commit | 58a99dd5ac5755cb02feb0feecb18d294eaa805c (patch) | |
| tree | 5cf269bb15017f740fbdf81c48158ae515f51778 /ipaserver/install | |
| parent | f5e839ef213d409b501b197cda3a974a55af518b (diff) | |
| download | freeipa-58a99dd5ac5755cb02feb0feecb18d294eaa805c.tar.gz freeipa-58a99dd5ac5755cb02feb0feecb18d294eaa805c.tar.xz freeipa-58a99dd5ac5755cb02feb0feecb18d294eaa805c.zip | |
Add SIDs for existing users and groups at the end of ipa-adtrust-install
Fixes https://fedorahosted.org/freeipa/ticket/3104
Diffstat (limited to 'ipaserver/install')
| -rw-r--r-- | ipaserver/install/adtrustinstance.py | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 79503c46e..1a92b2885 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -110,6 +110,7 @@ class ADTRUSTInstance(service.Service): self.domain_name = None self.netbios_name = None self.no_msdcs = None + self.add_sids = None self.smbd_user = None self.suffix = DN() self.ldapi_socket = None @@ -360,6 +361,16 @@ class ADTRUSTInstance(service.Service): try: self._ldap_mod("ipa-sidgen-conf.ldif", self.sub_dict) self._ldap_mod("ipa-sidgen-task-conf.ldif", self.sub_dict) + except Exception: + pass + + def __add_sids(self): + """ + Add SIDs for existing users and groups + """ + + try: + self._ldap_mod("ipa-sidgen-task-run.ldif", self.sub_dict) except: pass @@ -602,7 +613,8 @@ class ADTRUSTInstance(service.Service): FQDN = self.fqdn) def setup(self, fqdn, ip_address, realm_name, domain_name, netbios_name, - rid_base, secondary_rid_base, no_msdcs=False, smbd_user="samba"): + rid_base, secondary_rid_base, no_msdcs=False, add_sids=False, + smbd_user="samba"): self.fqdn = fqdn self.ip_address = ip_address self.realm = realm_name @@ -611,6 +623,7 @@ class ADTRUSTInstance(service.Service): self.rid_base = rid_base self.secondary_rid_base = secondary_rid_base self.no_msdcs = no_msdcs + self.add_sids = add_sids self.smbd_user = smbd_user self.suffix = ipautil.realm_to_suffix(self.realm) self.ldapi_socket = "%%2fvar%%2frun%%2fslapd-%s.socket" % \ @@ -700,6 +713,10 @@ class ADTRUSTInstance(service.Service): self.__configure_selinux_for_smbd) self.step("starting CIFS services", self.__start) + if self.add_sids: + self.step("adding SIDs to existing users and groups", + self.__add_sids) + self.start_creation("Configuring CIFS:") def uninstall(self): |