From 47281d1c55c5fc15f1d242c53899020abc994f38 Mon Sep 17 00:00:00 2001
From: Markus Makela <markus.makela@mariadb.com>
Date: Tue, 16 Feb 2016 16:04:50 +0200
Subject: [PATCH] MXS-582: Moved to crypt_r

Replaced all calls to crypt with crypt_r.
---
 server/core/adminusers.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/core/adminusers.c b/server/core/adminusers.c
index eae77028f..0633eaf22 100644
--- a/server/core/adminusers.c
+++ b/server/core/adminusers.c
@@ -104,7 +104,9 @@ admin_verify(char *username, char *password)
         {
             return 0;
         }
-        if (strcmp(pw, crypt(password, ADMIN_SALT)) == 0)
+        struct crypt_data cdata;
+        cdata.initialized = 0;
+        if (strcmp(pw, crypt_r(password, ADMIN_SALT, &cdata)) == 0)
         {
             return 1;
         }
@@ -191,7 +193,9 @@ admin_add_user(char *uname, char *passwd)
     {
         return ADMIN_ERR_DUPLICATE;
     }
-    cpasswd = crypt(passwd, ADMIN_SALT);
+    struct crypt_data cdata;
+    cdata.initialized = 0;
+    cpasswd = crypt_r(passwd, ADMIN_SALT, &cdata);
     users_add(users, uname, cpasswd);
     if ((fp = fopen(fname, "a")) == NULL)
     {