diff options
| author | Andreas Schneider <mail@cynapses.org> | 2009-12-21 12:32:58 +0100 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2009-12-21 12:33:44 +0100 |
| commit | 27e332b623948a3976258f33943d2d7d74e6d9f8 (patch) | |
| tree | cfe38e4616e0f3f6d499c98b21962c3b0bb2dc20 | |
| parent | ebc8544c56464239ebc2b59bd20ddccdf66126f5 (diff) | |
| download | libssh-27e332b623948a3976258f33943d2d7d74e6d9f8.tar.gz libssh-27e332b623948a3976258f33943d2d7d74e6d9f8.tar.xz libssh-27e332b623948a3976258f33943d2d7d74e6d9f8.zip | |
Fixed ssh_get_user_home_dir() to be thread safe.
| -rw-r--r-- | libssh/misc.c | 15 |
1 files 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; } |