From 6d3fa7f892efc699a802f39a9002d281756571c1 Mon Sep 17 00:00:00 2001 From: Karl MacMillan Date: Mon, 19 Nov 2007 15:08:32 -0500 Subject: [PATCH] Minor fixes. --- ipa-server/ipa-install/share/bootstrap-template.ldif | 2 +- ipa-server/ipa-install/share/default-aci.ldif | 1 - ipa-server/ipaserver/dsinstance.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ipa-server/ipa-install/share/bootstrap-template.ldif b/ipa-server/ipa-install/share/bootstrap-template.ldif index 9a7b1489e..e557fde52 100644 --- a/ipa-server/ipa-install/share/bootstrap-template.ldif +++ b/ipa-server/ipa-install/share/bootstrap-template.ldif @@ -102,7 +102,7 @@ gidNumber: 1003 description: Limited admins who can edit other users cn: editors -dn: cn=ipaConfig,cn=etc,dc=greyoak,dc=com +dn: cn=ipaConfig,cn=etc,$SUFFIX changetype: add objectClass: nsContainer objectClass: top diff --git a/ipa-server/ipa-install/share/default-aci.ldif b/ipa-server/ipa-install/share/default-aci.ldif index 29792ea9a..f5988f2e7 100644 --- a/ipa-server/ipa-install/share/default-aci.ldif +++ b/ipa-server/ipa-install/share/default-aci.ldif @@ -14,7 +14,6 @@ dn: cn=ipaConfig,cn=etc,$SUFFIX changetype: modify add: aci aci: (targetattr = "ipaUserSearchFields || ipaGroupSearchFields || ipaSearchTimeLimit || ipaSearchRecordsLimit || ipaCustomFields || ipaHomesRootDir || ipaDefaultLoginShell || ipaDefaultPrimaryGroup || ipaMaxUsernameLength || ipaPwdExpAdvNotify")(version 3.0;acl "Admins can write IPA policy"; allow (write) groupdn="ldap:///cn=admins,cn=groups,cn=accounts,$SUFFIX";) -replace: aci dn: cn=accounts,$SUFFIX changetype: modify diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 0b9a7a502..d1e8f3abc 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -97,7 +97,7 @@ class DsInstance(service.Service): except: # TODO: roll back here? logging.critical("Failed to restart the ds instance") - self.__config_uidgid_gen_first_master() + self.__config_uidgid_gen_first_master() self.__add_default_layout() self.__add_master_entry_first_master() self.__init_memberof()