summaryrefslogtreecommitdiff
path: root/ssh-keysign.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-10-15 12:13:05 +1100
committerDamien Miller <djm@mindrot.org>2013-10-15 12:13:05 +1100
commit194fd904d8597a274b93e075b2047afdf5a175d4 (patch)
treee8bd17b8455a41b3dc493b2b69933b8ef0cbfff7 /ssh-keysign.c
parent71df752de2a04f423b1cd18d961a79f4fbccbcee (diff)
- djm@cvs.openbsd.org 2013/10/14 22:22:05
[readconf.c readconf.h ssh-keysign.c ssh.c ssh_config.5] add a "Match" keyword to ssh_config that allows matching on hostname, user and result of arbitrary commands. "nice work" markus@
Diffstat (limited to 'ssh-keysign.c')
-rw-r--r--ssh-keysign.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keysign.c b/ssh-keysign.c
index 9a6653c7c..b67ed1ead 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-keysign.c,v 1.37 2013/05/17 00:13:14 djm Exp $ */ 1/* $OpenBSD: ssh-keysign.c,v 1.38 2013/10/14 22:22:04 djm Exp $ */
2/* 2/*
3 * Copyright (c) 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -187,7 +187,7 @@ main(int argc, char **argv)
187 187
188 /* verify that ssh-keysign is enabled by the admin */ 188 /* verify that ssh-keysign is enabled by the admin */
189 initialize_options(&options); 189 initialize_options(&options);
190 (void)read_config_file(_PATH_HOST_CONFIG_FILE, "", &options, 0); 190 (void)read_config_file(_PATH_HOST_CONFIG_FILE, pw, "", &options, 0);
191 fill_default_options(&options); 191 fill_default_options(&options);
192 if (options.enable_ssh_keysign != 1) 192 if (options.enable_ssh_keysign != 1)
193 fatal("ssh-keysign not enabled in %s", 193 fatal("ssh-keysign not enabled in %s",