From 4f2939e77a15968a3b43517bae0c084a93f4b35b Mon Sep 17 00:00:00 2001
From: Ted Trask <ttrask01@yahoo.com>
Date: Sat, 19 Oct 2013 23:56:19 +0000
Subject: Remove all calls to 'module' in preparation for move to Lua 5.2

Use mymodule parameter for module definition.
This was also helpful in revealing places where the code relied on the global environment.
---
 heimdal-model.lua | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'heimdal-model.lua')

diff --git a/heimdal-model.lua b/heimdal-model.lua
index 5cd9ecc..fea2481 100644
--- a/heimdal-model.lua
+++ b/heimdal-model.lua
@@ -1,4 +1,4 @@
-module(..., package.seeall)
+local mymodule = {}
 
 -- Load libraries
 modelfunctions = require("modelfunctions")
@@ -14,26 +14,26 @@ local packagename = "heimdal"
 -- ################################################################################
 -- PUBLIC FUNCTIONS
 
-function getstatus()
+function mymodule.getstatus()
 	return modelfunctions.getstatus(nil, packagename, "Heimdal Status")
 end
 
-function get_filedetails()
+function mymodule.get_filedetails()
 	return modelfunctions.getfiledetails(configfile)
 end
 
-function update_filedetails(self, filedetails)
+function mymodule.update_filedetails(self, filedetails)
 	return modelfunctions.setfiledetails(self, filedetails, {configfile})
 end
 
-function get_kinit()
+function mymodule.get_kinit()
 	local value = {}
 	value.login = cfe({ label="KDC login", seq=1 })
 	value.password = cfe({ type="password", label="KDC password", seq=2 })
 	return cfe({ type="group", value=value, label="Kinit Parameters" })
 end
 
-function set_kinit(self, data)
+function mymodule.set_kinit(self, data)
 	local tmp = "/tmp/k"..os.time()
 	fs.write_file(tmp, data.value.password.value)
 	data.descr, data.errtxt = modelfunctions.run_executable({"kinit", "--password-file="..tmp, data.value.login.value}, true)
@@ -42,18 +42,20 @@ function set_kinit(self, data)
 	return data
 end
 
-function klist()
+function mymodule.klist()
 	local result, errtxt = modelfunctions.run_executable({"klist"})
 	if not errtxt and result == "" then result = "No tickets found" end
 	return cfe({ value=result, label="List of Kerberos Tickets", errtxt=errtxt })
 end
 
-function get_kdestroy()
+function mymodule.get_kdestroy()
 	return cfe({ type="group", value={}, label="Destroy Tickets" })
 end
 
-function kdestroy(self, kd)
+function mymodule.kdestroy(self, kd)
 	kd.descr, kd.errtxt = modelfunctions.run_executable({"kdestroy"})
 	if not kd.errtxt and kd.descr == "" then kd.descr = "Successfully Destroyed Tickets" end
 	return kd
 end
+
+return mymodule
-- 
cgit v1.2.3