On 10/09/2012 10:23 AM, Martin Kosek wrote: > On 10/08/2012 07:50 PM, Simo Sorce wrote: >> On Mon, 2012-10-08 at 18:35 +0200, Sumit Bose wrote: >>> >>> Thank you for the review, both issues are fixed in the new version. >>> >> Ack, >> Simo. >> > > Pushed to master, ipa-3-0. > > Martin >
I accidentally pushed older version of Sumit's patch, so I prepared an interdiff of these 2 patches. While at it, I squashed a one-liner amending a name of the default SMB group in a list of protected groups in group.py (patch attached), Pushed to master, ipa-3-0. Martin
From f520888da2b3aebe8cd4d00fb95ca52f777a3116 Mon Sep 17 00:00:00 2001 From: Martin Kosek <mko...@redhat.com> Date: Tue, 9 Oct 2012 11:03:00 +0200 Subject: [PATCH] Minor fixes for default SMB group This patch contains additional minor fixes which were proposed during review but were not pushed (accidentaly). Also amends a name of the default SMB group in a list of protected groups in group.py. https://fedorahosted.org/freeipa/ticket/3147 --- install/share/default-smb-group.ldif | 2 +- ipalib/plugins/group.py | 2 +- ipaserver/install/adtrustinstance.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/share/default-smb-group.ldif b/install/share/default-smb-group.ldif index 8d89f67cc7d8be66375c9accb038b3c20a4d4be4..abcc8a945a8187529044beeb73262b5434070b48 100644 --- a/install/share/default-smb-group.ldif +++ b/install/share/default-smb-group.ldif @@ -1,7 +1,7 @@ dn: cn=Default SMB Group,cn=groups,cn=accounts,$SUFFIX changetype: add cn: Default SMB Group -description: Fallback group for primary group RID, do not add user to this group +description: Fallback group for primary group RID, do not add users to this group gidnumber: 999 objectclass: top objectclass: ipaobject diff --git a/ipalib/plugins/group.py b/ipalib/plugins/group.py index 1611e422bbef3d1ee9c71a819b7f9cc13cd819ab..a174ba62cc32a7fb83474f52e2621521553889af 100644 --- a/ipalib/plugins/group.py +++ b/ipalib/plugins/group.py @@ -107,7 +107,7 @@ Example: ipa group-add-member ad_admins --groups ad_admins_external """) -PROTECTED_GROUPS = (u'admins', u'trust admins', u'default_smb_group') +PROTECTED_GROUPS = (u'admins', u'trust admins', u'default smb group') class group(LDAPObject): """ diff --git a/ipaserver/install/adtrustinstance.py b/ipaserver/install/adtrustinstance.py index 41030223d1f644ba6a6557ac90d8f518fcba9c29..d86f9f51463912c3541a27118843c30d88439ae5 100644 --- a/ipaserver/install/adtrustinstance.py +++ b/ipaserver/install/adtrustinstance.py @@ -238,8 +238,8 @@ class ADTRUSTInstance(service.Service): try: self.admin_conn.getEntry(fb_group_dn, ldap.SCOPE_BASE) except errors.NotFound: - self.print_msg("Failed to add fallback group.") - return + self.print_msg("Failed to add fallback group.") + return try: mod = [(ldap.MOD_ADD, self.ATTR_FALLBACK_GROUP, fb_group_dn)] -- 1.7.11.4
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
