summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2019-01-19 21:37:48 +0000
committerDamien Miller <djm@mindrot.org>2019-01-20 09:02:44 +1100
commit172a592a53ebe8649c4ac0d7946e6c08eb151af6 (patch)
treef7279c9f91927cc1c8517ebc61cccba00a29e4bb /sshd.c
parent8cc7a679d29cf6ecccfa08191e688c7f81ef95c2 (diff)
upstream: convert servconf.c to new packet API
with & ok markus@ OpenBSD-Commit-ID: 126553aecca302c9e02fd77e333b9cb217e623b4
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sshd.c b/sshd.c
index ad8c152a5..64f27a7bb 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.522 2019/01/19 21:31:32 djm Exp $ */ 1/* $OpenBSD: sshd.c,v 1.523 2019/01/19 21:37:48 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1493,7 +1493,7 @@ main(int ac, char **av)
1493 test_flag = 2; 1493 test_flag = 2;
1494 break; 1494 break;
1495 case 'C': 1495 case 'C':
1496 connection_info = get_connection_info(0, 0); 1496 connection_info = get_connection_info(ssh, 0, 0);
1497 if (parse_server_match_testspec(connection_info, 1497 if (parse_server_match_testspec(connection_info,
1498 optarg) == -1) 1498 optarg) == -1)
1499 exit(1); 1499 exit(1);
@@ -1776,7 +1776,7 @@ main(int ac, char **av)
1776 * use a blank one that will cause no predicate to match. 1776 * use a blank one that will cause no predicate to match.
1777 */ 1777 */
1778 if (connection_info == NULL) 1778 if (connection_info == NULL)
1779 connection_info = get_connection_info(0, 0); 1779 connection_info = get_connection_info(ssh, 0, 0);
1780 parse_server_match_config(&options, connection_info); 1780 parse_server_match_config(&options, connection_info);
1781 dump_config(&options); 1781 dump_config(&options);
1782 } 1782 }