diff options
| author | elly <elly@leptoquark.net> | 2013-02-22 14:45:17 -0500 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-02-26 15:10:20 -0800 |
| commit | bf90bd29fd4fa6b0f5ddf5d5bf362cc0514a769c (patch) | |
| tree | c37056e4b42d4e9b08b1eb1d8274bbd0bd0f35c6 /man | |
| parent | 321d42f690e390771504daf85b5abe94c2d06812 (diff) | |
| download | tlsdate-bf90bd29fd4fa6b0f5ddf5d5bf362cc0514a769c.tar.gz | |
BACKPORT: tlsdated: support command-line proxy override
This makes a proxy passed on the command line with -x supplant proxies for
configured sources, and makes the 'proxy' stanza in sources optional (in which
case we supply no proxy argument for them).
BUG=chromium-os:38801
TEST=unit
Signed-off-by: Elly Fong-Jones <ellyjones@chromium.org>
(cherry picked from commit 254dc20bbaa68f955b1de8c7da6a02d52c786fd0)
Change-Id: I537037bd15d7c873f87e820a5291fc7a7e0ffca1
Reviewed-on: https://gerrit.chromium.org/gerrit/44075
Reviewed-by: Will Drewry <wad@chromium.org>
Commit-Queue: Elly Jones <ellyjones@chromium.org>
Tested-by: Elly Jones <ellyjones@chromium.org>
Reviewed-by: Kees Cook <keescook@chromium.org>
Diffstat (limited to 'man')
| -rw-r--r-- | man/tlsdated.1 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/man/tlsdated.1 b/man/tlsdated.1 index 639230c..97188ab 100644 --- a/man/tlsdated.1 +++ b/man/tlsdated.1 @@ -50,6 +50,8 @@ be verbose print help message .IP "\-f [/path/to/config/file]" use alternate config file +.IP "\-x [proxy]" +override the proxy supplied to sources in the config file .IP "[tlsdate command]" arguments to be passed to tlsdate at launch time |