From 23dcc2c7f35d575aefa051aab676233cf734c076 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <mail@cynapses.org>
Date: Mon, 21 Dec 2009 12:32:58 +0100
Subject: Fixed ssh_get_user_home_dir() to be thread safe.

---
 libssh/misc.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libssh/misc.c b/libssh/misc.c
index 71679d40..b94241a4 100644
--- a/libssh/misc.c
+++ b/libssh/misc.c
@@ -112,16 +112,23 @@ int gettimeofday(struct timeval *__p, void *__t) {
   return (0);
 }
 #else /* _WIN32 */
+#ifndef NSS_BUFLEN_PASSWD
+#define NSS_BUFLEN_PASSWD 4096
+#endif
+
 char *ssh_get_user_home_dir(void) {
   char *szPath = NULL;
-  struct passwd *pwd = NULL;
+  struct passwd pwd;
+  struct passwd *pwdbuf;
+  char buf[NSS_BUFLEN_PASSWD];
+  int rc;
 
-  pwd = getpwuid(getuid());
-  if (pwd == NULL) {
+  rc = getpwuid_r(getuid(), &pwd, buf, NSS_BUFLEN_PASSWD, &pwdbuf);
+  if (rc != 0) {
     return NULL;
   }
 
-  szPath = strdup(pwd->pw_dir);
+  szPath = strdup(pwd.pw_dir);
 
   return szPath;
 }
-- 
cgit v1.2.3