From: Steven Barth <steven@midlink.org>
Date: Mon, 29 Sep 2008 16:02:54 +0000 (+0000)
Subject: Added support for shadow passwords
X-Git-Tag: 0.9.0~1191
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=a63363130730a543c1a7291f18068f027b83c9ed

Added support for shadow passwords
---

diff --git a/libs/sys/luasrc/sys.lua b/libs/sys/luasrc/sys.lua
index b3155c8c8..4bf294678 100644
--- a/libs/sys/luasrc/sys.lua
+++ b/libs/sys/luasrc/sys.lua
@@ -437,11 +437,23 @@ function user.checkpasswd(username, password)
 	local account = user.getuser(username)
 
 	if account then
-		if account.passwd == "!" then
+		local pwd = account.passwd
+		if pwd == "!" then
 			return true
-		else
-			return (account.passwd == posix.crypt(password, account.passwd))
+		elseif pwd == "x" then
+			pwd = nil
+			for l in io.lines("/etc/shadow") do
+				pwd = l:match("^%s:([^:]+)" % username)
+				if pwd then
+					break
+				end
+			end
+			if not pwd then
+				return nil, "No shadow password for " .. username
+			end
 		end
+
+		return (pwd == posix.crypt(password, pwd))
 	end
 end