summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/misc.h
diff options
context:
space:
mode:
authordtucker <dtucker@openbsd.org>2020-05-29 04:25:40 +0000
committerdtucker <dtucker@openbsd.org>2020-05-29 04:25:40 +0000
commitbc1b80f45cd449470808bef982947f242ac94bcc (patch)
tree89d6614fb80b9250e1dc141e18712848fac64146 /usr.bin/ssh/misc.h
parentpointless referencing .h files in SYNOPSIS (diff)
downloadwireguard-openbsd-bc1b80f45cd449470808bef982947f242ac94bcc.tar.xz
wireguard-openbsd-bc1b80f45cd449470808bef982947f242ac94bcc.zip
Allow some keywords to expand shell-style ${ENV} environment
variables on the client side. The supported keywords are CertificateFile, ControlPath, IdentityAgent and IdentityFile, plus LocalForward and RemoteForward when used for Unix domain socket paths. This would for example allow forwarding of Unix domain socket paths that change at runtime. bz#3140, ok djm@
Diffstat (limited to 'usr.bin/ssh/misc.h')
-rw-r--r--usr.bin/ssh/misc.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h
index 64d81a6f529..79e6ab50c1c 100644
--- a/usr.bin/ssh/misc.h
+++ b/usr.bin/ssh/misc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.h,v 1.85 2020/05/26 01:06:52 djm Exp $ */
+/* $OpenBSD: misc.h,v 1.86 2020/05/29 04:25:40 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -68,7 +68,10 @@ int parse_uri(const char *, const char *, char **, char **, int *, char **);
long convtime(const char *);
const char *fmt_timeframe(time_t t);
char *tilde_expand_filename(const char *, uid_t);
+
+char *dollar_expand(int *, const char *string);
char *percent_expand(const char *, ...) __attribute__((__sentinel__));
+char *percent_dollar_expand(const char *, ...) __attribute__((__sentinel__));
char *tohex(const void *, size_t);
void xextendf(char **s, const char *sep, const char *fmt, ...)
__attribute__((__format__ (printf, 3, 4))) __attribute__((__nonnull__ (3)));