From: Jo-Philipp Wich <jow@openwrt.org>
Date: Wed, 8 Aug 2012 09:48:50 +0000 (+0000)
Subject: libs/web: adapt dispatcher to sauth api changes
X-Git-Tag: 0.11.0~465
X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=7bca24db1b94547d94e0c2e66fa4a819eac7e198

libs/web: adapt dispatcher to sauth api changes
---

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 7c77f2e97..9c0bf60b8 100644
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -352,9 +352,6 @@ function dispatch(request)
 		local user
 
 		if sdat then
-			sdat = loadstring(sdat)
-			setfenv(sdat, {})
-			sdat = sdat()
 			if not verifytoken or ctx.urltoken.stok == sdat.token then
 				user = sdat.user
 			end
@@ -376,11 +373,12 @@ function dispatch(request)
 					local sid = sess or luci.sys.uniqueid(16)
 					if not sess then
 						local token = luci.sys.uniqueid(16)
-						sauth.write(sid, util.get_bytecode({
+						sauth.reap()
+						sauth.write(sid, {
 							user=user,
 							token=token,
 							secret=luci.sys.uniqueid(16)
-						}))
+						})
 						ctx.urltoken.stok = token
 					end
 					luci.http.header("Set-Cookie", "sysauth=" .. sid.."; path="..build_url())