From 8aa06d621a22228c7d46fe62f89d71f85e23ca6e Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Fri, 5 Jul 2019 10:25:10 -0700 Subject: [PATCH] Add documentation for use_session_token and use_rrs Fixes #929. --- doc/man/s3fs.1 | 5 +++++ src/s3fs_util.cpp | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/doc/man/s3fs.1 b/doc/man/s3fs.1 index 3047d64..824f42b 100644 --- a/doc/man/s3fs.1 +++ b/doc/man/s3fs.1 @@ -303,6 +303,11 @@ utf-8 by mapping offending codes into a 'private' codepage of the Unicode set. Useful on clients not using utf-8 as their file system encoding. .TP +\fB\-o\fR use_session_token - indicate that session token should be provided. +If credentials are provided by environment variables this switch +forces presence check of AWSSESSIONTOKEN variable. +Otherwise an error is returned. +.TP \fB\-o\fR dbglevel (default="crit") Set the debug message level. set value as crit (critical), err (error), warn (warning), info (information) to debug level. default debug level is critical. If s3fs run with "-d" option, the debug level is set information. diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp index 4c88ef3..9b5642a 100644 --- a/src/s3fs_util.cpp +++ b/src/s3fs_util.cpp @@ -1039,6 +1039,12 @@ void show_help () " - store object with specified storage class. Possible values:\n" " standard, standard_ia, onezone_ia and reduced_redundancy.\n" "\n" + " use_rrs (default is disable)\n" + " - use Amazon's Reduced Redundancy Storage.\n" + " this option can not be specified with use_sse.\n" + " (can specify use_rrs=1 for old version)\n" + " this option has been replaced by new storage_class option.\n" + "\n" " use_sse (default is disable)\n" " - Specify three type Amazon's Server-Site Encryption: SSE-S3,\n" " SSE-C or SSE-KMS. SSE-S3 uses Amazon S3-managed encryption\n"