From 2028c75471063f0cbaa8ee5a034566f051142674 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fw@deneb.enyo.de>
Date: Sun, 18 May 2008 14:31:57 +0200
Subject: [PATCH] Split from_ssh_auth_fd into two subprograms

---
 dowkd.in | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/dowkd.in b/dowkd.in
index d314dbf..9b6605c 100644
--- a/dowkd.in
+++ b/dowkd.in
@@ -214,13 +214,8 @@ sub cleanup_ssh_auth_line ($) {
     return undef;
 }
 
-sub from_ssh_auth_file ($) {
-    my $name = shift;
-    my $auth;
-    unless (open $auth, '<', $name) {
-	warn "$name:0: error: open failed: $!\n";
-	return;
-    }
+sub from_ssh_auth_fd ($$) {
+    my ($name, $auth) = @_;
     my $tmp = new File::Temp;
     while (my $line = <$auth>) {
 	chomp $line;
@@ -247,6 +242,16 @@ sub from_ssh_auth_file ($) {
     }
 }
 
+sub from_ssh_auth_file ($) {
+    my $name = shift;
+    my $auth;
+    unless (open $auth, '<', $name) {
+	warn "$name:0: error: open failed: $!\n";
+	return;
+    }
+    return from_ssh_auth_fd $name, $auth;
+}
+
 sub from_openvpn_key ($) {
     my $name = shift;
     my $key;
-- 
2.11.4.GIT