diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2013-01-02 00:24:59 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2013-01-02 00:24:59 +0000 |
| commit | 45216c18fef804f12b7278e220ed89278d85fb37 (patch) | |
| tree | 4a81607984101fc044eaba31de24d183073d2196 | |
| parent | aa34c125d7d7d0d6a3d7503c68b0e68b3fa41835 (diff) | |
| download | acf-samba-45216c18fef804f12b7278e220ed89278d85fb37.tar.bz2 acf-samba-45216c18fef804f12b7278e220ed89278d85fb37.tar.xz | |
Replace io.popen with modelfunctions.run_executable
| -rw-r--r-- | samba-model.lua | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/samba-model.lua b/samba-model.lua index a1f17e6..086b818 100644 --- a/samba-model.lua +++ b/samba-model.lua @@ -156,11 +156,9 @@ function get_join() end end if not errtxt then - local cmd = path.."net "..join.." testjoin 2>&1" - local f = io.popen(cmd) - status[#status+1] = f:read("*a") or "" - f:close() - if string.find(status[#status], "^sh:") then status[#status] = "Error - not installed" end + local cmdresult + cmdresult, errtxt = modelfunctions.run_executable({"net", join, "testjoin"}, true) + status[#status+1] = cmdresult end return cfe({ type="group", value=connect, label="Join a Domain", descr=table.concat(status, "\n"), errtxt=errtxt }) @@ -182,11 +180,7 @@ function set_join(self, connect) end end if not errtxt then - local cmd = path.."net "..join.." join -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") or "" - f:close() - if string.find(connect.descr, "^sh:") then connect.descr = "Error - not installed" end + connect.descr, connect.errtxt = modelfunctions.run_executable({"net", join, "join", "-U"..connect.value.login.value.."%"..connect.value.password.value}, true) end return connect |