Changeset 6790

Timestamp:

01/25/11 13:52:35 (2 years ago)

Author:

jow

Message:

luci-0.10: merge r6789

Files:

• luci/branches/luci-0.10/libs/sys/luasrc/sys.lua (modified) (1 diff)

luci/branches/luci-0.10/libs/sys/luasrc/sys.lua

@@ -605 +605 @@
 function user.setpasswd(username, password)
     if password then
-        password = password:gsub("'", "")
+        password = password:gsub("'", [['"'"']])
     end
 
     if username then
-        username = username:gsub("'", "")
-    end
-
-    local cmd = "(echo '"..password.."';sleep 1;echo '"..password.."')|"
-    cmd = cmd .. "passwd '"..username.."' >/dev/null 2>&1"
-    return os.execute(cmd)
+        username = username:gsub("'", [['"'"']])
+    end
+
+    return os.execute(
+        "(echo '" .. password .. "'; sleep 1; echo '" .. password .. "') | " ..
+        "passwd '" .. username .. "' >/dev/null 2>&1"
+    )
 end