From 8a5f9c9695a55ed0e963a395a9fc837d4826854c Mon Sep 17 00:00:00 2001
From: Florian Weimer <fw@deneb.enyo.de>
Date: Sun, 18 May 2008 16:28:43 +0200
Subject: [PATCH] Remove from_ssh_auth_fd and fold it into from_ssh_auth_file

---
 dowkd.in | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/dowkd.in b/dowkd.in
index bb149af..3f46dee 100644
--- a/dowkd.in
+++ b/dowkd.in
@@ -253,14 +253,6 @@ sub from_ssh_auth_line ($$$) {
     warn "$name: warning: unparsable line\n";
 }
 
-sub from_ssh_auth_fd ($$) {
-    my ($name, $auth) = @_;
-    my $tmp = new File::Temp;
-    while (my $line = <$auth>) {
-	from_ssh_auth_line $tmp, "$name:$.", $line;
-    }
-}
-
 sub from_ssh_auth_file ($) {
     my $name = shift;
     my $auth;
@@ -268,7 +260,11 @@ sub from_ssh_auth_file ($) {
 	warn "$name:0: error: open failed: $!\n";
 	return;
     }
-    return from_ssh_auth_fd $name, $auth;
+
+    my $tmp = new File::Temp;
+    while (my $line = <$auth>) {
+	from_ssh_auth_line $tmp, "$name:$.", $line;
+    }
 }
 
 sub from_openvpn_key ($) {
-- 
2.11.4.GIT