On Thu, 2013-07-04 at 11:20 +0200, Jan Cholasta wrote:
> On 3.7.2013 22:11, Nathaniel McCallum wrote:
> > https://fedorahosted.org/freeipa/ticket/3766
> >
> 
> If the directory doesn't exist, update_ssh_keys is no-op, so I would prefer
> 
> if not os.path.isdir(ssh_dir):
>      return
> 
> at the beginning of update_ssh_keys instead.

Attached.

I don't care which version of the patch gets merged...
>From 83899d6f42321ff62db182353778322c2592bdf8 Mon Sep 17 00:00:00 2001
From: Nathaniel McCallum <npmccal...@redhat.com>
Date: Wed, 3 Jul 2013 15:52:15 -0400
Subject: [PATCH] Fix client install exception if /etc/ssh is missing

https://fedorahosted.org/freeipa/ticket/3766
---
 ipa-client/ipa-install/ipa-client-install | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index b1881619d46c6e2e2beadd5130c92947e9c59aa3..867307aa570b4e8e90a1a8182f1481f0d11a9840 100755
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -1411,6 +1411,9 @@ def client_dns(server, hostname, dns_updates=False):
         update_dns(server, hostname)
 
 def update_ssh_keys(server, hostname, ssh_dir, create_sshfp):
+    if not os.path.isdir(ssh_dir):
+        return
+
     pubkeys = []
     for basename in os.listdir(ssh_dir):
         if not basename.endswith('.pub'):
-- 
1.8.3.1

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

Reply via email to