hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.3' into 2.4

Browse Source
This commit is contained in:
Niclas Antti
2020-07-27 14:55:58 +03:00
parent 62082c2a12 ffb237628c
commit ce05b68030
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maxutils/maxbase/include/maxbase/stopwatch.hh
View File

@ -60,7 +60,7 @@ struct Duration : public Clock::duration
* *
* A std::chrono::time_point to go with Clock and Duration. * A std::chrono::time_point to go with Clock and Duration.
*/ */
using TimePoint = std::chrono::time_point<Clock, Duration>; using TimePoint = std::chrono::steady_clock::time_point;
/** /**
* @class StopWatch * @class StopWatch

4
server/core/secrets.cc
View File

@ -55,7 +55,7 @@ static int secrets_random_str(unsigned char* output, int len)
static MAXKEYS* secrets_readKeys(const char* path) static MAXKEYS* secrets_readKeys(const char* path)
{ {
static const char NAME[] = ".secrets"; static const char NAME[] = ".secrets";
char secret_file[PATH_MAX + 1 + sizeof(NAME)]; // Worst case: maximum path + "/" + name. char secret_file[PATH_MAX + 1 + sizeof(NAME) + 1]; // Worst case: maximum path + "/" + name+ '\0'
MAXKEYS* keys; MAXKEYS* keys;
struct stat secret_stats; struct stat secret_stats;
static int reported = 0; static int reported = 0;
@ -255,7 +255,7 @@ int secrets_write_keys(const char* dir)
return 1; return 1;
} }
snprintf(secret_file, PATH_MAX + 9, "%s/.secrets", dir); snprintf(secret_file, PATH_MAX + 10, "%s/.secrets", dir);
clean_up_pathname(secret_file); clean_up_pathname(secret_file);
/* Open for writing | Create | Truncate the file for writing */ /* Open for writing | Create | Truncate the file for writing */