cabele/rmmagent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

use cwd for everything

Browse source
This commit is contained in:
wh1te909 2023-03-29 17:41:24 +00:00
parent 407f2a8072
commit 56cbf8a9d7
5 changed files with 27 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

26
agent/agent_unix.go
View file

@ -230,11 +230,9 @@ func (a *Agent) AgentUpdate(url, inno, version string) {
cwd := filepath.Dir(self)
// create a tmpfile in same location as current binary
// avoids issues with /tmp dir and other fs mount issues
tmpfile := filepath.Join(cwd, GenerateAgentID())
f, err := os.Create(tmpfile)
f, err := os.CreateTemp(cwd, "trmm")
if err != nil {
a.Logger.Errorln("AgentUpdate() os.Create(tmpfile)", err)
a.Logger.Errorln("AgentUpdate() os.CreateTemp:", err)
return
}
defer os.Remove(f.Name())
@ -477,26 +475,6 @@ func (a *Agent) GetWMIInfo() map[string]interface{} {
return wmiInfo
}
func createNixTmpFile() (*os.File, error) {
var f *os.File
noexec := tmpNoExec()
f, err := os.CreateTemp("", "trmm")
if err != nil || noexec {
if noexec {
os.Remove(f.Name())
}
cwd, err := os.Getwd()
if err != nil {
return f, err
}
f, err = os.CreateTemp(cwd, "trmm")
if err != nil {
return f, err
}
}
return f, nil
}
// windows only below TODO add into stub file
func (a *Agent) GetAgentCheckInConfig(ret AgentCheckInConfig) AgentCheckInConfig {
return ret