summaryrefslogtreecommitdiff
path: root/readconf.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-06-18 01:19:03 +1000
committerDamien Miller <djm@mindrot.org>2004-06-18 01:19:03 +1000
commit23f0770a1bf8b0a1aa7c8d4bd78699fa0e9358d0 (patch)
treea4011718b766af34f837471c2311e6cd044e2c20 /readconf.c
parent3756dcee244f47c20a6590129d99e625169836c6 (diff)
- djm@cvs.openbsd.org 2004/06/17 15:10:14
[clientloop.c misc.h readconf.c readpass.c ssh.c ssh_config.5] Add option for confirmation (ControlMaster=ask) via ssh-askpass before opening shared connections; ok markus@
Diffstat (limited to 'readconf.c')
-rw-r--r--readconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/readconf.c b/readconf.c
index 2b1d7cc4..429f6912 100644
--- a/readconf.c
+++ b/readconf.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: readconf.c,v 1.132 2004/06/13 15:03:02 djm Exp $");
+RCSID("$OpenBSD: readconf.c,v 1.133 2004/06/17 15:10:14 djm Exp $");
#include "ssh.h"
#include "xmalloc.h"
@@ -772,7 +772,7 @@ parse_int:
case oControlMaster:
intptr = &options->control_master;
- goto parse_flag;
+ goto parse_yesnoask;
case oDeprecated:
debug("%s line %d: Deprecated option \"%s\"",