From 24f33237eda1fddd82010b88fe1e8033a4c27976 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 20 Sep 2019 15:36:36 -0400 Subject: [PATCH] ipa-restore: Restore ownership and perms on 389-ds log directory Previously it would end up being owned by root:root mode 0755 instead of dirsrv:dirsrv mode 0770. https://pagure.io/freeipa/issue/7725 Signed-off-by: Rob Crittenden Reviewed-By: Florence Blanc-Renaud Reviewed-By: Florence Blanc-Renaud --- ipaserver/install/ipa_restore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 4941831585f473c4937b23b3f59d8ff99a654b0e..917f516c8fa414b23dcb451c9105c59e0afeec51 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -592,11 +592,15 @@ class Restore(admintool.AdminTool): logger.info("Waiting for LDIF to finish") wait_for_task(conn, dn) else: + template_dir = paths.VAR_LOG_DIRSRV_INSTANCE_TEMPLATE % instance try: - os.makedirs(paths.VAR_LOG_DIRSRV_INSTANCE_TEMPLATE % instance) + os.makedirs(template_dir) except OSError as e: pass + os.chown(template_dir, pent.pw_uid, pent.pw_gid) + os.chmod(template_dir, 0o770) + args = [paths.LDIF2DB, '-Z', instance, '-i', ldiffile, -- 2.20.1