diff -r b962d83124bc -r 57e706fed20a src/server/util/util.c --- a/src/server/util/util.c Tue Nov 10 21:18:51 2015 +0100 +++ b/src/server/util/util.c Tue Feb 09 22:53:59 2016 +0100 @@ -428,13 +428,9 @@ { struct passwd *rv; -#if defined(AIX) || defined(LINUX) || defined(HPUX) || defined(BSD) errno = getpwnam_r(name, result, buffer, buflen, &rv); if (errno != 0) rv = NULL; -#else - rv = getpwnam_r(name, result, buffer, buflen); -#endif return rv; } @@ -447,13 +443,9 @@ { struct passwd *rv; -#if defined(AIX) || defined(LINUX) || defined(HPUX) || defined(BSD) errno = getpwuid_r(uid, result, buffer, buflen, &rv); if (errno != 0) rv = NULL; -#else - rv = getpwuid_r(uid, result, buffer, buflen); -#endif return rv; } @@ -484,7 +476,11 @@ sstr_t child = sstr(ch); sstr_t newstr; sstr_t s; - + if(parent.ptr[parent.length-1] == '/') { + s.length = 0; + } else { + s = S("/"); + } UcxAllocator a = util_pool_allocator(pool); if(s.length == 1) {