On 04/12/14 10:03, Jan Pazdziora wrote:
On Wed, Dec 03, 2014 at 05:16:23PM +0100, Martin Basti wrote:
On 02/12/14 13:00, Jan Pazdziora wrote:
Hello,

presumably explicitly specifying zone is not needed and can be
harmful.

This should be fixed in template for uploading SSHFP keys as well.

I have zone bububu.test.

2014-12-03T04:00:36Z DEBUG debug
zone client.bububu.test.
update delete test.client.bububu.test. IN SSHFP
show
send
update add test.client.bububu.test. 1200 IN SSHFP 1 1
8FD003E98D818E4E2813672234410835AB5844AC
update add test.client.bububu.test. 1200 IN SSHFP 1 2
37BF6366A44B67F6CA8FF8A8313B7C964CEA971CCB3E092D775FDF082170AAA4
update add test.client.bububu.test. 1200 IN SSHFP 3 1
3651173F6737DF24EB6494434AC5968B3C90B749
update add test.client.bububu.test. 1200 IN SSHFP 3 2
97EF4030A9DD471A3D4730A819B3A662E11994BB20AFC56FC3875AB1662260BF
show
send
Updated patch attached.

ACK
I just removed unused dict value.

@@ -1590,8 +1590,7 @@ def update_dns(server, hostname):

     sub_dict = dict(HOSTNAME=hostname,
                     IPADDRESS=ip,
-                    TTL=1200,
-                    ZONE='.'.join(hostname.split('.')[1:])
+                    TTL=1200
                 )

     if af == socket.AF_INET:


Patch with this update attached.

--
Martin Basti

From 95040f2f1ab4953b0b6ea339d57ce95d2a769564 Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdzi...@redhat.com>
Date: Tue, 2 Dec 2014 11:48:04 +0100
Subject: [PATCH] No explicit zone specification.

https://fedorahosted.org/freeipa/ticket/4780
---
 ipa-client/ipa-install/ipa-client-install | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index 7b1e2f8b0b873375c14d02558dce65b68a5ad173..54a85a7f1ca52e29a254d69e9e631fed03a066c0 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1557,7 +1557,6 @@ def do_nsupdate(update_txt):
 
 UPDATE_TEMPLATE_A = """
 debug
-zone $ZONE.
 update delete $HOSTNAME. IN A
 show
 send
@@ -1568,7 +1567,6 @@ send
 
 UPDATE_TEMPLATE_AAAA = """
 debug
-zone $ZONE.
 update delete $HOSTNAME. IN AAAA
 show
 send
@@ -1592,8 +1590,7 @@ def update_dns(server, hostname):
 
     sub_dict = dict(HOSTNAME=hostname,
                     IPADDRESS=ip,
-                    TTL=1200,
-                    ZONE='.'.join(hostname.split('.')[1:])
+                    TTL=1200
                 )
 
     if af == socket.AF_INET:
@@ -1668,10 +1665,9 @@ def update_ssh_keys(server, hostname, ssh_dir, create_sshfp):
         return
 
     if create_sshfp:
-        zone = '.'.join(hostname.split('.')[1:])
         ttl = 1200
 
-        update_txt = 'debug\nzone %s.\n' % zone
+        update_txt = 'debug\n'
         update_txt += 'update delete %s. IN SSHFP\nshow\nsend\n' % hostname
         for pubkey in pubkeys:
             sshfp = pubkey.fingerprint_dns_sha1()
-- 
1.8.3.1

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

Reply via email to