diff options
| author | Yuri Victorovich <yuri@FreeBSD.org> | 2018-04-23 15:49:47 +0000 |
|---|---|---|
| committer | Yuri Victorovich <yuri@FreeBSD.org> | 2018-04-23 15:49:47 +0000 |
| commit | 01c8f600d103034255887830e14aee3c7f1f6e43 (patch) | |
| tree | 26633f202a8a32dc52e0991bd853c9b90d9acdf5 /databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp | |
| parent | www/minio: Update to 2018.04.19.22.54.58 (diff) | |
databases/arangodb33: Update 3.3.3 -> 3.3.7
Port changes:
* Update maintaner e-mail galu@packetdam.com -> dev@dudu.ro
* Patch updates and additions
PR: 227637
Submitted by: Vlad Galu <dev@dudu.ro> (mantainer)
Notes
Notes:
svn path=/head/; revision=468099
Diffstat (limited to 'databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp')
| -rw-r--r-- | databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp b/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp index b3134688347a..df9643a70ff3 100644 --- a/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp +++ b/databases/arangodb33/files/patch-arangod_RestHandler_RestAuthHandler.cpp @@ -1,11 +1,11 @@ ---- arangod/RestHandler/RestAuthHandler.cpp.orig 2017-11-15 11:23:07 UTC +--- arangod/RestHandler/RestAuthHandler.cpp.orig 2018-04-06 22:44:29 UTC +++ arangod/RestHandler/RestAuthHandler.cpp -@@ -59,7 +59,7 @@ std::string RestAuthHandler::generateJwt +@@ -54,7 +54,7 @@ std::string RestAuthHandler::generateJwt VPackObjectBuilder p(&bodyBuilder); bodyBuilder.add("preferred_username", VPackValue(username)); bodyBuilder.add("iss", VPackValue("arangodb")); - bodyBuilder.add("exp", VPackValue(exp.count())); + bodyBuilder.add("exp", VPackValue((int64_t)exp.count())); } - return authentication->authInfo()->generateJwt(bodyBuilder); - } + AuthenticationFeature* af = AuthenticationFeature::instance(); + TRI_ASSERT(af != nullptr); |