diff --git a/lib/server/users.js b/lib/server/users.js index c24123d4..4b959833 100644 --- a/lib/server/users.js +++ b/lib/server/users.js @@ -56,26 +56,22 @@ */ function get(passwd) { var uid, name, line, + passwdArray = passwd.split('\n'), users = {}; - if (passwd) - do { - line = passwd.substr(passwd, passwd.indexOf('\n') + 1); + passwdArray.forEach(function(line) { + passwd = Util.rmStr(passwd, line); - if (line) { - passwd = Util.rmStr(passwd, line); - - /* получаем первое слово строки */ - name = line.substr(line, line.indexOf(':')); - line = Util.rmStr(line, name + ':x:'); - - /* получаем uid */ - uid = line.substr(line, line.indexOf(':')); - - if (uid) - users[uid] = name; - } - } while (passwd); + /* получаем первое слово строки */ + name = line.substr(line, line.indexOf(':')); + line = Util.rmStr(line, name + ':x:'); + + /* получаем uid */ + uid = line.substr(line, line.indexOf(':')); + + if (uid) + users[uid] = name; + }); return users; }