|
 |
0201d8 |
From ce31d4124e20261cbd561f688110046945b082c1 Mon Sep 17 00:00:00 2001
|
|
|
0201d8 |
From: Tomas Babej <tbabej@redhat.com>
|
|
|
0201d8 |
Date: Thu, 19 Feb 2015 17:10:37 +0100
|
|
|
0201d8 |
Subject: [PATCH] ipalib: Make sure correct attribute name is referenced for
|
|
|
0201d8 |
fax
|
|
|
0201d8 |
|
|
|
0201d8 |
Fixes the invalid attribute name reference in the
|
|
|
0201d8 |
'System: Read User Addressbook Attributes' permission.
|
|
|
0201d8 |
|
|
|
0201d8 |
https://fedorahosted.org/freeipa/ticket/4883
|
|
|
0201d8 |
|
|
|
0201d8 |
Reviewed-By: Martin Kosek <mkosek@redhat.com>
|
|
|
0201d8 |
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
|
|
|
0201d8 |
---
|
|
|
0201d8 |
ACI.txt | 2 +-
|
|
|
0201d8 |
ipalib/plugins/user.py | 2 +-
|
|
|
0201d8 |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
0201d8 |
|
|
|
0201d8 |
diff --git a/ACI.txt b/ACI.txt
|
|
|
0201d8 |
index 67d583fabc295deb8aa5aab329bce5100c1b9088..fa1dcc4a8c9fd0c610dadcb2c368f700d26d4011 100644
|
|
|
0201d8 |
--- a/ACI.txt
|
|
|
0201d8 |
+++ b/ACI.txt
|
|
|
0201d8 |
@@ -255,7 +255,7 @@ aci: (targetattr = "businesscategory || carlicense || cn || description || displ
|
|
|
0201d8 |
dn: cn=UPG Definition,cn=Definitions,cn=Managed Entries,cn=etc,dc=ipa,dc=example
|
|
|
0201d8 |
aci: (targetattr = "*")(target = "ldap:///cn=UPG Definition,cn=Definitions,cn=Managed Entries,cn=etc,dc=ipa,dc=example")(version 3.0;acl "permission:System: Read UPG Definition";allow (compare,read,search) groupdn = "ldap:///cn=System: Read UPG Definition,cn=permissions,cn=pbac,dc=ipa,dc=example";)
|
|
|
0201d8 |
dn: cn=users,cn=accounts,dc=ipa,dc=example
|
|
|
0201d8 |
-aci: (targetattr = "audio || businesscategory || carlicense || departmentnumber || destinationindicator || employeenumber || employeetype || fax || homephone || homepostaladdress || inetuserhttpurl || inetuserstatus || internationalisdnnumber || jpegphoto || l || labeleduri || mail || mobile || o || ou || pager || photo || physicaldeliveryofficename || postaladdress || postalcode || postofficebox || preferreddeliverymethod || preferredlanguage || registeredaddress || roomnumber || secretary || seealso || st || street || telephonenumber || teletexterminalidentifier || telexnumber || usercertificate || usersmimecertificate || x121address || x500uniqueidentifier")(targetfilter = "(objectclass=posixaccount)")(version 3.0;acl "permission:System: Read User Addressbook Attributes";allow (compare,read,search) userdn = "ldap:///all";)
|
|
|
0201d8 |
+aci: (targetattr = "audio || businesscategory || carlicense || departmentnumber || destinationindicator || employeenumber || employeetype || facsimiletelephonenumber || homephone || homepostaladdress || inetuserhttpurl || inetuserstatus || internationalisdnnumber || jpegphoto || l || labeleduri || mail || mobile || o || ou || pager || photo || physicaldeliveryofficename || postaladdress || postalcode || postofficebox || preferreddeliverymethod || preferredlanguage || registeredaddress || roomnumber || secretary || seealso || st || street || telephonenumber || teletexterminalidentifier || telexnumber || usercertificate || usersmimecertificate || x121address || x500uniqueidentifier")(targetfilter = "(objectclass=posixaccount)")(version 3.0;acl "permission:System: Read User Addressbook Attributes";allow (compare,read,search) userdn = "ldap:///all";)
|
|
|
0201d8 |
dn: dc=ipa,dc=example
|
|
|
0201d8 |
aci: (targetattr = "cn || createtimestamp || entryusn || gecos || gidnumber || homedirectory || loginshell || modifytimestamp || objectclass || uid || uidnumber")(target = "ldap:///cn=users,cn=compat,dc=ipa,dc=example")(version 3.0;acl "permission:System: Read User Compat Tree";allow (compare,read,search) userdn = "ldap:///anyone";)
|
|
|
0201d8 |
dn: cn=users,cn=accounts,dc=ipa,dc=example
|
|
|
0201d8 |
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
|
|
|
0201d8 |
index 56585b9f86593c0c5879139103bc71707b88e15f..abe5ee26b8e48681eeb0cbb3bcff8617e212225c 100644
|
|
|
0201d8 |
--- a/ipalib/plugins/user.py
|
|
|
0201d8 |
+++ b/ipalib/plugins/user.py
|
|
|
0201d8 |
@@ -276,7 +276,7 @@ class user(LDAPObject):
|
|
|
0201d8 |
'ipapermright': {'read', 'search', 'compare'},
|
|
|
0201d8 |
'ipapermdefaultattr': {
|
|
|
0201d8 |
'seealso', 'telephonenumber',
|
|
|
0201d8 |
- 'fax', 'l', 'ou', 'st', 'postalcode', 'street',
|
|
|
0201d8 |
+ 'facsimiletelephonenumber', 'l', 'ou', 'st', 'postalcode', 'street',
|
|
|
0201d8 |
'destinationindicator', 'internationalisdnnumber',
|
|
|
0201d8 |
'physicaldeliveryofficename', 'postaladdress', 'postofficebox',
|
|
|
0201d8 |
'preferreddeliverymethod', 'registeredaddress',
|
|
|
0201d8 |
--
|
|
|
0201d8 |
2.1.0
|
|
|
0201d8 |
|