summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2009-01-13 16:01:06 +0000
committerTed Trask <ttrask01@yahoo.com>2009-01-13 16:01:06 +0000
commitc26612b5fe2867d6da9a7c31689e186a05ae6cff (patch)
treeb1a5f12b6c0d7a061f8e52181c33553418b5fe7c
parent446a0900d360f19bfa493046b5398b76f8703a23 (diff)
downloadacf-squid-c26612b5fe2867d6da9a7c31689e186a05ae6cff.tar.bz2
acf-squid-c26612b5fe2867d6da9a7c31689e186a05ae6cff.tar.xz
Modified fs.lua to survive nil parameters. Added create_directory and used within create_file and write_file. Reviewed each read_file call to make sure handles nil return value.
git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@1677 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--squid-model.lua18
1 files changed, 9 insertions, 9 deletions
diff --git a/squid-model.lua b/squid-model.lua
index ab2dc5c..ef7a93b 100644
--- a/squid-model.lua
+++ b/squid-model.lua
@@ -55,7 +55,7 @@ read_digest_userlist = function()
retval.value.filecontent.descr = "List of username:password entries"
-- check to see if the file is being used
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
config = config or format.parse_linesandwords(configcontent)
retval.value.status = cfe({ errtxt="Digest authentication not enabled", label="User list status" })
@@ -80,7 +80,7 @@ update_digest_userlist = function( userlistdetails )
end
enable_digest_userlist = function()
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
local newline = "auth_param digest program /usr/sbin/digest_pw_auth "..squiddigestusers
local lastauth, authline
@@ -173,7 +173,7 @@ read_config = function()
authmethod = { type="multi", value={}, label="Authentication Methods", option={"negotiate", "ntlm", "digest", "basic"} },
}
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
config = config or format.parse_linesandwords(configcontent)
if config then
@@ -196,7 +196,7 @@ end
update_config = function(newconfig)
local success, newconfig = validate_config(newconfig)
if success then
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
local lastport, lastlog, lastcache, lastauth
local didports = {}
@@ -326,7 +326,7 @@ end
--[[
read_acls = function()
local acls = cfe({ type="structure", value={}, label="Squid Access Lists" })
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
config = config or format.parse_linesandwords(configcontent)
for i,line in ipairs(config) do
if line[1] == "acl" then
@@ -340,14 +340,14 @@ end
read_acl = function(linenum)
local line = cfe({ label="Squid Access List" })
local linecfe = cfe({ value=linenum, label="Line number" })
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
line.value = format.getline(configcontent, linenum) or ""
return cfe({ type="group", value={line=line, linenum=linecfe}, label="Squid Access List" })
end
update_acl = function(acl)
-- local success, acl = validate_acl(acl)
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
configcontent = format.replaceline(configcontent, acl.value.linenum.value, acl.value.line.value)
fs.write_file(squidconf, string.gsub(configcontent, "\n+$", ""))
config = nil
@@ -357,7 +357,7 @@ end
create_acl = function(acl)
-- local success, acl = validate_acl(acl)
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
config = config or format.parse_linesandwords(configcontent)
local linenum = -1
for i=#config,1,-1 do
@@ -377,7 +377,7 @@ create_acl = function(acl)
end
delete_acl = function(linenum)
- configcontent = configcontent or fs.read_file(squidconf)
+ configcontent = configcontent or fs.read_file(squidconf) or ""
configcontent = format.replaceline(configcontent, linenum)
fs.write_file(squidconf, string.gsub(configcontent, "\n+$", ""))
config = nil