summaryrefslogtreecommitdiff
path: root/readconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2011-05-15 08:45:50 +1000
committerDamien Miller <djm@mindrot.org>2011-05-15 08:45:50 +1000
commit21771e22d3e23a10cb01983b2df83d47362eadda (patch)
treef9b85caefb4f1549c847d34a7c7b3adead764c6b /readconf.h
parentfe92421772243702ecb18b862dbeb51a9bdbbc6e (diff)
downloadopenssh-git-21771e22d3e23a10cb01983b2df83d47362eadda.tar.gz
- djm@cvs.openbsd.org 2011/05/06 21:34:32
[clientloop.c mux.c readconf.c readconf.h ssh.c ssh_config.5] Add a RequestTTY ssh_config option to allow configuration-based control over tty allocation (like -t/-T); ok markus@
Diffstat (limited to 'readconf.h')
-rw-r--r--readconf.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/readconf.h b/readconf.h
index ee160dfe..bc3e8c1b 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.88 2010/11/13 23:27:50 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.89 2011/05/06 21:34:32 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -132,6 +132,7 @@ typedef struct {
int use_roaming;
+ int request_tty;
} Options;
#define SSHCTL_MASTER_NO 0
@@ -140,6 +141,11 @@ typedef struct {
#define SSHCTL_MASTER_ASK 3
#define SSHCTL_MASTER_AUTO_ASK 4
+#define REQUEST_TTY_AUTO 0
+#define REQUEST_TTY_NO 1
+#define REQUEST_TTY_YES 2
+#define REQUEST_TTY_FORCE 3
+
void initialize_options(Options *);
void fill_default_options(Options *);
int read_config_file(const char *, const char *, Options *, int);