diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-09-29 18:01:28 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-09-29 18:01:28 +0000 |
| commit | bead940829930379aeabae0f2a99aaffa90540cc (patch) | |
| tree | b3183e865b8db206f7a458c71f53fecbaf33ada8 | |
| parent | d10bfaacce98bf00dd04b4b275c25b0399eef8f8 (diff) | |
| download | acf-shorewall-bead940829930379aeabae0f2a99aaffa90540cc.tar.bz2 acf-shorewall-bead940829930379aeabae0f2a99aaffa90540cc.tar.xz | |
Removed getopts library and added functionality to format library as opts_to_table, table_to_opts, parse_configfile2, update_configfile2, get_section, and set_section. New functions work on strings, not files. Modified all code using getopts to use format instead. Fixed nil string bugs in TCPProxy. Fixed forward only bug in DNSCache.
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@1535 ab2d0c66-481e-0410-8bed-d214d4d58bed
| -rw-r--r-- | shorewall-model.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shorewall-model.lua b/shorewall-model.lua index 53e56d7..f6a2527 100644 --- a/shorewall-model.lua +++ b/shorewall-model.lua @@ -3,7 +3,7 @@ module(..., package.seeall) -- Load libraries require("modelfunctions") require("fs") -require("getopts") +require("format") -- Set variables local configfile = "/etc/shorewall/shorewall.conf" @@ -198,7 +198,7 @@ function configcheck () end function getlogfile () - local logfilepath = getopts.getoptsfromfile(configfile,"","LOGFILE") or "" + local logfilepath = format.parse_configfile2(fs.read_file(configfile),"","LOGFILE") or "" return cfe({ value=logfilepath, label="Shorewall logfile" }) end |