summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2009-01-21 22:04:37 +0000
committerTed Trask <ttrask01@yahoo.com>2009-01-21 22:04:37 +0000
commit4dbcbeef70fa055e16cb44c28f75eafd96b93ae7 (patch)
tree7c8d759cb5ae081a78467fc4360bad3d09a1bfa2
parent9dddc2e9e27cd11a0d74e3a632209bb34fb506da (diff)
downloadacf-samba-4dbcbeef70fa055e16cb44c28f75eafd96b93ae7.tar.bz2
acf-samba-4dbcbeef70fa055e16cb44c28f75eafd96b93ae7.tar.xz
Added escapespecialcharacters to format.lua to escape shell special characters. Reviewed all calls to io.popen and os.execute to escape special characters. Fixed file uploads in openssl and ipsectools with viewfunctions.lua. Tried to fix openssl renew when subject contains special characters, but not done yet.
git-svn-id: svn://svn.alpinelinux.org/acf/samba/trunk@1687 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--samba-model.lua7
1 files changed, 4 insertions, 3 deletions
diff --git a/samba-model.lua b/samba-model.lua
index 402d4d7..726b8f2 100644
--- a/samba-model.lua
+++ b/samba-model.lua
@@ -131,9 +131,10 @@ function get_join()
connect.domain.value = config.global.workgroup
end
- local f = io.popen(path.."net rpc testjoin 2<&1")
- local status = f:read("*a")
+ local f = io.popen(path.."net rpc testjoin 2>&1")
+ local status = f:read("*a") or ""
f:close()
+ if string.find(status, "^sh:") then status = "Error - not installed" end
return cfe({ type="group", value=connect, label="Join a Domain", descr=status })
end
@@ -155,7 +156,7 @@ function set_join(connect)
--else
cmd = cmd .. "net rpc join"
--end
- cmd = cmd .. " -U"..connect.value.login.value.."%"..connect.value.password.value.." 2>&1"
+ cmd = cmd .. " -U"..format.escapespecialcharacters(connect.value.login.value).."%"..format.escapespecialcharacters(connect.value.password.value).." 2>&1"
local f = io.popen(cmd)
connect.descr = f:read("*a")
f:close()