diff options
| -rw-r--r-- | samba-model.lua | 7 |
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() |