===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfile.c,v
retrieving revision 1.62.2.1
retrieving revision 1.63
diff -u -r1.62.2.1 -r1.63
--- src/usr.bin/ssh/authfile.c	2006/09/30 04:06:50	1.62.2.1
+++ src/usr.bin/ssh/authfile.c	2006/03/13 10:26:52	1.63
@@ -1,4 +1,3 @@
-/* $OpenBSD: authfile.c,v 1.62.2.1 2006/09/30 04:06:50 brad Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -36,26 +35,20 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
+RCSID("$OpenBSD: authfile.c,v 1.63 2006/03/13 10:26:52 dtucker Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/param.h>
-#include <sys/uio.h>
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "xmalloc.h"
 #include "cipher.h"
+#include "xmalloc.h"
 #include "buffer.h"
+#include "bufaux.h"
 #include "key.h"
 #include "ssh.h"
 #include "log.h"
@@ -194,7 +187,7 @@
 		return 0;
 	}
 	fp = fdopen(fd, "w");
-	if (fp == NULL) {
+	if (fp == NULL ) {
 		error("fdopen %s failed: %s.", filename, strerror(errno));
 		close(fd);
 		return 0;
@@ -221,10 +214,12 @@
 	case KEY_RSA1:
 		return key_save_private_rsa1(key, filename, passphrase,
 		    comment);
+		break;
 	case KEY_DSA:
 	case KEY_RSA:
 		return key_save_private_pem(key, filename, passphrase,
 		    comment);
+		break;
 	default:
 		break;
 	}
@@ -542,7 +537,7 @@
 
 Key *
 key_load_private_type(int type, const char *filename, const char *passphrase,
-    char **commentp, int *perm_ok)
+    char **commentp)
 {
 	int fd;
 
@@ -550,24 +545,22 @@
 	if (fd < 0)
 		return NULL;
 	if (!key_perm_ok(fd, filename)) {
-		if (perm_ok != NULL)
-			*perm_ok = 0;
 		error("bad permissions: ignore key: %s", filename);
 		close(fd);
 		return NULL;
 	}
-	if (perm_ok != NULL)
-		*perm_ok = 1;
 	switch (type) {
 	case KEY_RSA1:
 		return key_load_private_rsa1(fd, filename, passphrase,
 		    commentp);
 		/* closes fd */
+		break;
 	case KEY_DSA:
 	case KEY_RSA:
 	case KEY_UNSPEC:
 		return key_load_private_pem(fd, type, passphrase, commentp);
 		/* closes fd */
+		break;
 	default:
 		close(fd);
 		break;