From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 25 Jan 2011 12:52:35 +0000 (+0000)
Subject: luci-0.10: merge r6789
X-Git-Tag: 0.10.0~216
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b563a74360ff9373ac7d4ac22b6e1286b78a0af6;p=oweals%2Fluci.git

luci-0.10: merge r6789
---

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index 1cf8b9f18..1333cd859 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -604,16 +604,17 @@ end
 -- @return			Number containing 0 on success and >= 1 on error
 function user.setpasswd(username, password)
 	if password then
-		password = password:gsub("'", "")
+		password = password:gsub("'", [['"'"']])
 	end
 
 	if username then
-		username = username:gsub("'", "")
+		username = username:gsub("'", [['"'"']])
 	end
 
-	local cmd = "(echo '"..password.."';sleep 1;echo '"..password.."')|"
-	cmd = cmd .. "passwd '"..username.."' >/dev/null 2>&1"
-	return os.execute(cmd)
+	return os.execute(
+		"(echo '" .. password .. "'; sleep 1; echo '" .. password .. "') | " ..
+		"passwd '" .. username .. "' >/dev/null 2>&1"
+	)
 end