diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2014-07-15 13:31:01 +0200 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2014-09-23 12:29:37 +0200 |
| commit | 5dfa1116c27e72d5b501daab89d05a20028ce507 (patch) | |
| tree | 547966bf022a087d53a00139b7fcf899369ba5e0 /ipaserver/install/ipa_restore.py | |
| parent | 846123cfc2768d15cee72fa5fe740d82bb99e8ef (diff) | |
| download | freeipa-5dfa1116c27e72d5b501daab89d05a20028ce507.tar.gz freeipa-5dfa1116c27e72d5b501daab89d05a20028ce507.tar.xz freeipa-5dfa1116c27e72d5b501daab89d05a20028ce507.zip | |
ipaserver.install: Consolidate system user creation
Sytem users and their groups are always created together.
Also, users & groups should never be removed once they exist
on the system (see comit a5a55ce).
Use a single function for generic user creation, and specific
funtions in dsinstance and cainstance.
Remove code left over from when we used to delete the DS user.
Preparation for: https://fedorahosted.org/freeipa/ticket/3866
Reviewed-By: Tomas Babej <tbabej@redhat.com>
Diffstat (limited to 'ipaserver/install/ipa_restore.py')
| -rw-r--r-- | ipaserver/install/ipa_restore.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 948d0be32..7929503f1 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -30,7 +30,7 @@ from ipapython import version from ipapython.ipautil import run, user_input from ipapython import admintool from ipapython.dn import DN -from ipaserver.install.dsinstance import (realm_to_serverid, create_ds_group, +from ipaserver.install.dsinstance import (realm_to_serverid, create_ds_user, DS_USER) from ipaserver.install.cainstance import PKI_USER from ipaserver.install.replication import (wait_for_task, ReplicationManager, @@ -188,7 +188,6 @@ class Restore(admintool.AdminTool): if options.data_only and not instances: raise admintool.ScriptError('No instances to restore to') - create_ds_group() create_ds_user() pent = pwd.getpwnam(DS_USER) |