summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2006-03-26 14:00:31 +1100
committerDamien Miller <djm@mindrot.org>2006-03-26 14:00:31 +1100
commit3305f5591f7a1b17565a1f13683d0b20287130c3 (patch)
tree855f4406cc2809c2faf153af434a2b56d0ae0d3a
parent4662d3492f24cf1d7974db805215c801e50cffc3 (diff)
- deraadt@cvs.openbsd.org 2006/03/19 18:59:09
[authfile.c] whoever thought that break after return was a good idea needs to get their head examimed
-rw-r--r--ChangeLog6
-rw-r--r--authfile.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index bd7b34ce..302b1e1f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,10 @@
- deraadt@cvs.openbsd.org 2006/03/19 18:59:30
[ssh.c]
spacing
+ - deraadt@cvs.openbsd.org 2006/03/19 18:59:09
+ [authfile.c]
+ whoever thought that break after return was a good idea needs to
+ get their head examimed
20060325
- OpenBSD CVS Sync
@@ -4309,4 +4313,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4256 2006/03/26 02:59:59 djm Exp $
+$Id: ChangeLog,v 1.4257 2006/03/26 03:00:31 djm Exp $
diff --git a/authfile.c b/authfile.c
index d529c834..55c66d1e 100644
--- a/authfile.c
+++ b/authfile.c
@@ -213,12 +213,10 @@ key_save_private(Key *key, const char *filename, const char *passphrase,
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;
}
@@ -556,13 +554,11 @@ key_load_private_type(int type, const char *filename, const char *passphrase,
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;