summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--servconf.c3
-rw-r--r--sshkey.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/servconf.c b/servconf.c
index 4bf0b2a35..35abec489 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,5 +1,5 @@
1 1
2/* $OpenBSD: servconf.c,v 1.297 2016/09/28 20:32:42 djm Exp $ */ 2/* $OpenBSD: servconf.c,v 1.298 2016/10/24 01:09:17 dtucker Exp $ */
3/* 3/*
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
5 * All rights reserved 5 * All rights reserved
@@ -1116,7 +1116,6 @@ process_server_config_line(ServerOptions *options, char *line,
1116 MAX_HOSTCERTS); 1116 MAX_HOSTCERTS);
1117 charptr = &options->host_cert_files[*intptr]; 1117 charptr = &options->host_cert_files[*intptr];
1118 goto parse_filename; 1118 goto parse_filename;
1119 break;
1120 1119
1121 case sPidFile: 1120 case sPidFile:
1122 charptr = &options->pid_file; 1121 charptr = &options->pid_file;
diff --git a/sshkey.c b/sshkey.c
index 25a360b7b..c01da6c39 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshkey.c,v 1.40 2016/10/04 21:34:40 djm Exp $ */ 1/* $OpenBSD: sshkey.c,v 1.41 2016/10/24 01:09:17 dtucker Exp $ */
2/* 2/*
3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved. 4 * Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -512,7 +512,6 @@ sshkey_new(int type)
512 default: 512 default:
513 free(k); 513 free(k);
514 return NULL; 514 return NULL;
515 break;
516 } 515 }
517 516
518 if (sshkey_is_cert(k)) { 517 if (sshkey_is_cert(k)) {