diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-31 13:47:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-31 15:10:02 +0300 |
| commit | 206528f722799b04708c60a71b59d75bd32bdeb3 (patch) | |
| tree | d59cf6cdc943a797bc9ef901865da3566c27d93a /plugin | |
| parent | b245023fe0bc6fa0bd6e2dfa9352b30b71d0d27d (diff) | |
| parent | f693170c75a1f39f3f06aca683fe4a1998785008 (diff) | |
| download | mariadb-git-206528f722799b04708c60a71b59d75bd32bdeb3.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/auth_ed25519/server_ed25519.c | 2 | ||||
| -rw-r--r-- | plugin/auth_pam/mapper/pam_user_map.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/plugin/auth_ed25519/server_ed25519.c b/plugin/auth_ed25519/server_ed25519.c index 8870c271b18..23b4e7389c7 100644 --- a/plugin/auth_ed25519/server_ed25519.c +++ b/plugin/auth_ed25519/server_ed25519.c @@ -100,7 +100,7 @@ maria_declare_plugin(ed25519) 0x0100, NULL, NULL, - "1.0-alpha", + "1.0", MariaDB_PLUGIN_MATURITY_STABLE } maria_declare_plugin_end; diff --git a/plugin/auth_pam/mapper/pam_user_map.c b/plugin/auth_pam/mapper/pam_user_map.c index c03ea12be74..e1d11acabb9 100644 --- a/plugin/auth_pam/mapper/pam_user_map.c +++ b/plugin/auth_pam/mapper/pam_user_map.c @@ -189,13 +189,15 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, s++; } from= s; - skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || (*s == '$')); + skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || + (*s == '$') || (*s == '\\') || (*s == '/')); end_from= s; skip(isspace(*s)); if (end_from == from || *s++ != ':') goto syntax_error; skip(isspace(*s)); to= s; - skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || (*s == '$')); + skip(isalnum(*s) || (*s == '_') || (*s == '.') || (*s == '-') || + (*s == '$')); end_to= s; if (end_to == to) goto syntax_error; |