[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Freeipa-devel] [PATCH 0061] Ensure ipaUserAuthTypeClass when needed on user creation



Also, remove the attempt to load the objectClasses when absent. This
never makes sense during an add operation.

https://fedorahosted.org/freeipa/ticket/4455
From 7ef7b1dfe63c9cce3ad7611e62288022a875fdd2 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccallum redhat com>
Date: Tue, 19 Aug 2014 16:32:33 -0400
Subject: [PATCH] Ensure ipaUserAuthTypeClass when needed on user creation

Also, remove the attempt to load the objectClasses when absent. This
never makes sense during an add operation.

https://fedorahosted.org/freeipa/ticket/4455
---
 ipalib/plugins/user.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index f646e85827bba4544f962c36f5f15c2a89cb2d75..8e13c253976e82dbd4f61990f4816cc634e635b5 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -780,23 +780,22 @@ class user_add(LDAPCreate):
         if 'manager' in entry_attrs:
             entry_attrs['manager'] = self.obj._normalize_manager(entry_attrs['manager'])
 
-        if ('objectclass' in entry_attrs
-            and 'userclass' in entry_attrs
-            and 'ipauser' not in entry_attrs['objectclass']):
-            entry_attrs['objectclass'].append('ipauser')
+        rcl = entry_attrs.get('ipatokenradiusconfiglink', None)
+        if 'objectclass' in entry_attrs:
+            if 'userclass' in entry_attrs and \
+               'ipauser' not in entry_attrs['objectclass']:
+                entry_attrs['objectclass'].append('ipauser')
 
-        if 'ipatokenradiusconfiglink' in entry_attrs:
-            cl = entry_attrs['ipatokenradiusconfiglink']
-            if cl:
-                if 'objectclass' not in entry_attrs:
-                    _entry = ldap.get_entry(dn, ['objectclass'])
-                    entry_attrs['objectclass'] = _entry['objectclass']
+            if 'ipauserauthtype' in entry_attrs and \
+               'ipauserauthtypeclass' not in entry_attrs['objectclass']:
+                entry_attrs['objectclass'].append('ipauserauthtypeclass')
 
-                if 'ipatokenradiusproxyuser' not in entry_attrs['objectclass']:
-                    entry_attrs['objectclass'].append('ipatokenradiusproxyuser')
+            if rcl and 'ipatokenradiusproxyuser' not in entry_attrs['objectclass']:
+                entry_attrs['objectclass'].append('ipatokenradiusproxyuser')
 
-                answer = self.api.Object['radiusproxy'].get_dn_if_exists(cl)
-                entry_attrs['ipatokenradiusconfiglink'] = answer
+        if rcl:
+            answer = self.api.Object['radiusproxy'].get_dn_if_exists(rcl)
+            entry_attrs['ipatokenradiusconfiglink'] = answer
 
         return dn
 
-- 
2.0.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]