Merge branch '2.2' into 2.3

2019-06-27 14:20:42 +03:00
parent 7d3c25200e b4289224de
commit d8790fa3e7
4 changed files with 55 additions and 15 deletions
--- a/server/modules/authenticator/PAM/PAMAuth/pam_auth.cc
+++ b/server/modules/authenticator/PAM/PAMAuth/pam_auth.cc
@ -29,6 +29,9 @@ const string FIELD_AUTHSTR = "authentication_string";
 const string FIELD_PROXY = "proxy_grant";
 const int NUM_FIELDS = 6;

+const char* SQLITE_OPEN_FAIL = "Failed to open SQLite3 handle for file '%s': '%s'";
+const char* SQLITE_OPEN_OOM = "Failed to allocate memory for SQLite3 handle for file '%s'.";
+
 /**
 * Initialize PAM authenticator
 *