Hello,

The working directory will be provided directly
by bind-dyndb-ldap package.

I'm testing the patch right now but I don't expect any problems. Please review this as soon as possible so we can release 3.3.4 ...

--
Petr^2 Spacek
From 2909bfd21af0501230f6fb7e2ed9f2129ca48c12 Mon Sep 17 00:00:00 2001
From: Petr Spacek <pspa...@redhat.com>
Date: Mon, 27 Jan 2014 14:47:10 +0100
Subject: [PATCH] Remove working directory for bind-dyndb-ldap plugin.

The working directory will be provided directly
by bind-dyndb-ldap package.

This partially reverts commit 689382dc833e687d30349b10a8fd7dc740d54d08.

https://fedorahosted.org/freeipa/ticket/3967
---
 freeipa.spec.in                   |  1 -
 install/tools/ipa-upgradeconfig   |  5 +----
 ipaserver/install/bindinstance.py | 13 -------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/freeipa.spec.in b/freeipa.spec.in
index f4e22831d579166f850a2e307b207942d4cbe296..c28928c1c5c2d20e2dfe6112750c70bfb0b55894 100644
--- a/freeipa.spec.in
+++ b/freeipa.spec.in
@@ -767,7 +767,6 @@ fi
 %{_mandir}/man1/ipa-backup.1.gz
 %{_mandir}/man1/ipa-restore.1.gz
 %{_mandir}/man1/ipa-advise.1.gz
-%ghost %{_localstatedir}/named/ipa
 
 %files server-trust-ad
 %{_sbindir}/ipa-adtrust-install
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig
index b281eb4eaf31a3d97cb4668cf7d38ab1f3e0f815..de50299715641a9a0b1fb37bf7ee50e946a5f144 100644
--- a/install/tools/ipa-upgradeconfig
+++ b/install/tools/ipa-upgradeconfig
@@ -1084,10 +1084,6 @@ def main():
     setup_firefox_extension(fstore)
     add_ca_dns_records()
 
-    bind = bindinstance.BindInstance(fstore)
-    if bind.is_configured():
-        bind.create_dir('/var/named/ipa', 0700)
-
     # Any of the following functions returns True iff the named.conf file
     # has been altered
     named_conf_changes = (
@@ -1101,6 +1097,7 @@ def main():
     if any(named_conf_changes):
         # configuration has changed, restart the name server
         root_logger.info('Changes to named.conf have been made, restart named')
+        bind = bindinstance.BindInstance(fstore)
         try:
             bind.restart()
         except ipautil.CalledProcessError, e:
diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py
index beeb39de6c29fa0635a26250d2517a554fe65a42..7c0085c6bf512e5d6491416e64f761bfe8815a6f 100644
--- a/ipaserver/install/bindinstance.py
+++ b/ipaserver/install/bindinstance.py
@@ -22,7 +22,6 @@ import os
 import pwd
 import netaddr
 import re
-import errno
 
 import ldap
 
@@ -510,16 +509,6 @@ class BindInstance(service.Service):
         os.close(bind_fd)
         print "Sample zone file for bind has been created in "+bind_name
 
-    def create_dir(self, path, mode):
-        try:
-            os.makedirs(path, mode)
-        except OSError as e:
-            if e.errno != errno.EEXIST:
-                raise e
-
-        pent = pwd.getpwnam(self.named_user or 'named')
-        os.chown(path, pent.pw_uid, pent.pw_gid)
-
     def create_instance(self):
 
         try:
@@ -530,8 +519,6 @@ class BindInstance(service.Service):
         # get a connection to the DS
         self.ldap_connect()
 
-        self.create_dir('/var/named/ipa', 0700)
-
         if installutils.record_in_hosts(self.ip_address, self.fqdn) is None:
             installutils.add_record_to_hosts(self.ip_address, self.fqdn)
 
-- 
1.8.3.1

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to