summaryrefslogtreecommitdiff
path: root/readconf.h
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 /readconf.h
parent71df752de2a04f423b1cd18d961a79f4fbccbcee (diff)
downloadopenssh-git-194fd904d8597a274b93e075b2047afdf5a175d4.tar.gz
- 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 'readconf.h')
-rw-r--r--readconf.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/readconf.h b/readconf.h
index ca4a042a..cde8b524 100644
--- a/readconf.h
+++ b/readconf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.h,v 1.96 2013/08/20 00:11:38 djm Exp $ */
+/* $OpenBSD: readconf.h,v 1.97 2013/10/14 22:22:03 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -159,12 +159,12 @@ typedef struct {
void initialize_options(Options *);
void fill_default_options(Options *);
-int read_config_file(const char *, const char *, Options *, int);
+int process_config_line(Options *, struct passwd *, const char *, char *,
+ const char *, int, int *, int);
+int read_config_file(const char *, struct passwd *, const char *,
+ Options *, int);
int parse_forward(Forward *, const char *, int, int);
-
-int
-process_config_line(Options *, const char *, char *, const char *, int, int *,
- int);
+int default_ssh_port(void);
void add_local_forward(Options *, const Forward *);
void add_remote_forward(Options *, const Forward *);