diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2020-12-18 00:10:27 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2020-12-21 00:52:22 +0100 |
| commit | 43026da035cd266db37df1f723d5575056150744 (patch) | |
| tree | 9d0d841461ff8a34abec7e8fd88e8aa708080ab7 /readconf.h | |
| parent | upstream: use _PATH_SSH_USER_DIR instead of hardcoded .ssh in path (diff) | |
| download | openssh-43026da035cd266db37df1f723d5575056150744.tar.xz openssh-43026da035cd266db37df1f723d5575056150744.zip | |
upstream: prepare readconf.c for fuzzing; remove fatal calls and
fix some (one-off) memory leaks; ok markus@
OpenBSD-Commit-ID: 91c6aec57b0e7aae9190de188e9fe8933aad5ec5
Diffstat (limited to 'readconf.h')
| -rw-r--r-- | readconf.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/readconf.h b/readconf.h index be9154da0..268dbf179 100644 --- a/readconf.h +++ b/readconf.h @@ -1,4 +1,4 @@ -/* $OpenBSD: readconf.h,v 1.135 2020/10/16 13:26:13 djm Exp $ */ +/* $OpenBSD: readconf.h,v 1.136 2020/12/17 23:10:27 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -205,8 +205,9 @@ const char *kex_default_pk_alg(void); char *ssh_connection_hash(const char *thishost, const char *host, const char *portstr, const char *user); void initialize_options(Options *); -void fill_default_options(Options *); +int fill_default_options(Options *); void fill_default_options_for_canonicalization(Options *); +void free_options(Options *o); int process_config_line(Options *, struct passwd *, const char *, const char *, char *, const char *, int, int *, int); int read_config_file(const char *, struct passwd *, const char *, |