diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-11-05 17:06:22 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2015-11-20 15:32:34 +0100 |
| commit | c56d45bc382a6e72c0439452994e998798b22b57 (patch) | |
| tree | fb8712099ca233a0e696489e58faff6bc587d48e /ipalib/plugins | |
| parent | 2d041daf17a4c461489cdd0879056d0cb5eacde5 (diff) | |
| download | freeipa-c56d45bc382a6e72c0439452994e998798b22b57.tar.gz freeipa-c56d45bc382a6e72c0439452994e998798b22b57.tar.xz freeipa-c56d45bc382a6e72c0439452994e998798b22b57.zip | |
Move common code of user and stageuser to baseuser postcallback
usser-add and stageuser-add contains common code that can be exported to
baseuser common postcallback
Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipalib/plugins')
| -rw-r--r-- | ipalib/plugins/baseuser.py | 3 | ||||
| -rw-r--r-- | ipalib/plugins/stageuser.py | 4 | ||||
| -rw-r--r-- | ipalib/plugins/user.py | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py index b974e3fb1..cf0fd88d9 100644 --- a/ipalib/plugins/baseuser.py +++ b/ipalib/plugins/baseuser.py @@ -491,6 +491,9 @@ class baseuser_add(LDAPCreate): def post_common_callback(self, ldap, dn, entry_attrs, **options): assert isinstance(dn, DN) self.obj.convert_usercertificate_post(entry_attrs, **options) + self.obj.get_password_attributes(ldap, dn, entry_attrs) + convert_sshpubkey_post(ldap, dn, entry_attrs) + radius_dn2pk(self.api, entry_attrs) class baseuser_del(LDAPDelete): """ diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 00fba1f83..47c96bb71 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -389,9 +389,7 @@ class stageuser_add(baseuser_add): # if both randompassword and userpassword options were used pass - self.obj.get_password_attributes(ldap, dn, entry_attrs) - convert_sshpubkey_post(ldap, dn, entry_attrs) - radius_dn2pk(self.api, entry_attrs) + self.post_common_callback(ldap, dn, entry_attrs, **options) return dn @register() diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 5c3e78b13..81a707035 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -568,9 +568,6 @@ class user_add(baseuser_add): # if both randompassword and userpassword options were used pass - self.obj.get_password_attributes(ldap, dn, entry_attrs) - convert_sshpubkey_post(ldap, dn, entry_attrs) - radius_dn2pk(self.api, entry_attrs) self.obj.get_preserved_attribute(entry_attrs, options) self.post_common_callback(ldap, dn, entry_attrs, **options) |