diff options
| author | Martin Kosek <mkosek@redhat.com> | 2012-10-09 11:03:00 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-10-09 12:15:07 +0200 |
| commit | 2411377d400f61f458a77bc2c64f721a629b1e3e (patch) | |
| tree | c13e40d244182cd2d602a27acd2ab474210a53b7 | |
| parent | 19a9376c72b1d17123f3ab1ad5a20480f725b90d (diff) | |
| download | freeipa-2411377d400f61f458a77bc2c64f721a629b1e3e.tar.gz freeipa-2411377d400f61f458a77bc2c64f721a629b1e3e.tar.xz freeipa-2411377d400f61f458a77bc2c64f721a629b1e3e.zip | |
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
| -rw-r--r-- | install/share/default-smb-group.ldif | 2 | ||||
| -rw-r--r-- | ipalib/plugins/group.py | 2 | ||||
| -rw-r--r-- | 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 8d89f67cc..abcc8a945 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 1611e422b..a174ba62c 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 41030223d..d86f9f514 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)] |