From eba71bab9bf01c0d688f829a8971f902732558df Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Sat, 29 Apr 2000 23:57:08 +1000
Subject:  - Merge big update to OpenSSH-2.0 from OpenBSD CVS   
 [README.openssh2]    - interop w/ F-secure windows client    - sync
 documentation    - ssh_host_dsa_key not ssh_dsa_key    [auth-rsa.c]    -
 missing fclose    [auth.c authfile.c compat.c dsa.c dsa.h hostfile.c key.c
 key.h radix.c]    [readconf.c readconf.h ssh-add.c ssh-keygen.c ssh.c ssh.h
 sshconnect.c]    [sshd.c uuencode.c uuencode.h authfile.h]    - add DSA
 pubkey auth and other SSH2 fixes.  use ssh-keygen -[xX]      for trading keys
 with the real and the original SSH, directly from the      people who
 invented the SSH protocol.    [auth.c auth.h authfile.c sshconnect.c auth1.c
 auth2.c sshconnect.h]    [sshconnect1.c sshconnect2.c]    - split
 auth/sshconnect in one file per protocol version    [sshconnect2.c]    -
 remove debug    [uuencode.c]    - add trailing =    [version.h]    -
 OpenSSH-2.0    [ssh-keygen.1 ssh-keygen.c]    - add -R flag: exit code
 indicates if RSA is alive    [sshd.c]    - remove unused      silent if -Q is
 specified    [ssh.h]    - host key becomes /etc/ssh_host_dsa_key   
 [readconf.c servconf.c ]    - ssh/sshd default to proto 1 and 2   
 [uuencode.c]    - remove debug    [auth2.c ssh-keygen.c sshconnect2.c sshd.c]
    - xfree DSA blobs    [auth2.c serverloop.c session.c]    - cleanup logging
 for sshd/2, respect PasswordAuth no    [sshconnect2.c]    - less debug,
 respect .ssh/config    [README.openssh2 channels.c channels.h]    -
 clientloop.c session.c ssh.c    - support for x11-fwding, client+server

---
 hostfile.c | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

(limited to 'hostfile.c')

diff --git a/hostfile.c b/hostfile.c
index 29efe5656..e1c2429bd 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: hostfile.c,v 1.16 2000/04/14 10:30:31 markus Exp $");
+RCSID("$OpenBSD: hostfile.c,v 1.17 2000/04/26 20:56:29 markus Exp $");
 
 #include "packet.h"
 #include "match.h"
@@ -39,13 +39,8 @@ hostfile_read_key(char **cpp, unsigned int *bitsp, Key *ret)
 	for (cp = *cpp; *cp == ' ' || *cp == '\t'; cp++)
 		;
 
-	/* Get number of bits. */
-	if (*cp < '0' || *cp > '9')
-		return 0;	/* Bad bit count... */
-	for (bits = 0; *cp >= '0' && *cp <= '9'; cp++)
-		bits = 10 * bits + *cp - '0';
-
-	if (!key_read(ret, bits, &cp))
+	bits = key_read(ret, &cp);
+	if (bits == 0)
 		return 0;
 
 	/* Skip trailing whitespace. */
@@ -182,24 +177,18 @@ add_host_to_hostfile(const char *filename, const char *host, Key *key)
 {
 	FILE *f;
 	int success = 0;
-
 	if (key == NULL)
-		return 1;
-
-	/* Open the file for appending. */
+		return 1;	/* XXX ? */
 	f = fopen(filename, "a");
 	if (!f)
 		return 0;
-
 	fprintf(f, "%s ", host);
 	if (key_write(key, f)) {
-		fprintf(f, "\n");
 		success = 1;
 	} else {
-		error("add_host_to_hostfile: saving key failed");
+		error("add_host_to_hostfile: saving key in %s failed", filename);
 	}
-
-	/* Close the file. */
+	fprintf(f, "\n");
 	fclose(f);
 	return success;
 }
-- 
cgit v1.2.3