3 Commits

Author SHA1 Message Date
yo
9218ae6daa Code formatting 2022-07-01 17:20:56 +02:00
yo
dcecaf6c62 Code formatting 2022-07-01 17:15:54 +02:00
yo
8d87cc12c4 BUGFIX: *id were not displayed correctly using -n 2022-07-01 12:12:08 +02:00
2 changed files with 239 additions and 240 deletions

View File

@ -117,7 +117,6 @@ const (
PRT_ONELINE = 1 PRT_ONELINE = 1
PRT_NORESOLVE_USER = 2 PRT_NORESOLVE_USER = 2
PRT_TIMESTAMP = 4 PRT_TIMESTAMP = 4
) )
var ( var (
@ -650,16 +649,16 @@ func (a *Attribute32) LoadFromBinary(rdr *bufio.Reader) error {
func (a *Attribute32) Print(file *os.File, delimiter string, flags int) { func (a *Attribute32) Print(file *os.File, delimiter string, flags int) {
var user string var user string
var group string var group string
// TODO : resolve Uid and Gid (also support domain accounts)
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
user = string(a.Uid) user = strconv.Itoa(int(a.Uid))
group = string(a.Gid) group = strconv.Itoa(int(a.Gid))
} else { } else {
user, _ = getUserName(a.Uid) user, _ = getUserName(a.Uid)
group, _ = getGroupName(a.Gid) group, _ = getGroupName(a.Gid)
} }
fmt.Fprintf(file, "attribute%s%o%s%v%s%v%s%v%s%v%s%v", delimiter, a.Mode, delimiter, user, delimiter, fmt.Fprintf(file, "attribute%s%o%s%s%s%s%s%v%s%v%s%v", delimiter, a.Mode, delimiter, user, delimiter,
group, delimiter, a.Fsid, delimiter, a.Nid, delimiter, a.Dev) group, delimiter, a.Fsid, delimiter, a.Nid, delimiter, a.Dev)
if 0 == (flags & PRT_ONELINE) { if 0 == (flags & PRT_ONELINE) {
@ -711,8 +710,8 @@ func (a *Attribute64) Print(file *os.File, delimiter string, flags int) {
var group string var group string
// TODO : resolve Uid and Gid (also support domain accounts) // TODO : resolve Uid and Gid (also support domain accounts)
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
user = string(a.Uid) user = strconv.Itoa(int(a.Uid))
group = string(a.Gid) group = strconv.Itoa(int(a.Gid))
} else { } else {
user, _ = getUserName(a.Uid) user, _ = getUserName(a.Uid)
group, _ = getGroupName(a.Gid) group, _ = getGroupName(a.Gid)
@ -775,11 +774,11 @@ func (s *Subject32) Print(file *os.File, delimiter string, flags int) {
var ruser string var ruser string
var rgroup string var rgroup string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(s.Auid) auser = strconv.Itoa(int(s.Auid))
euser = string(s.Euid) euser = strconv.Itoa(int(s.Euid))
egroup = string(s.Egid) egroup = strconv.Itoa(int(s.Egid))
ruser = string(s.Ruid) ruser = strconv.Itoa(int(s.Ruid))
rgroup = string(s.Rgid) rgroup = strconv.Itoa(int(s.Rgid))
} else { } else {
auser, _ = getUserName(s.Auid) auser, _ = getUserName(s.Auid)
euser, _ = getUserName(s.Euid) euser, _ = getUserName(s.Euid)
@ -846,11 +845,11 @@ func (p *Process32) Print(file *os.File, delimiter string, flags int) {
var ruser string var ruser string
var rgroup string var rgroup string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(p.Auid) auser = strconv.Itoa(int(p.Auid))
euser = string(p.Euid) euser = strconv.Itoa(int(p.Euid))
egroup = string(p.Egid) egroup = strconv.Itoa(int(p.Egid))
ruser = string(p.Ruid) ruser = strconv.Itoa(int(p.Ruid))
rgroup = string(p.Rgid) rgroup = strconv.Itoa(int(p.Rgid))
} else { } else {
auser, _ = getUserName(p.Auid) auser, _ = getUserName(p.Auid)
euser, _ = getUserName(p.Euid) euser, _ = getUserName(p.Euid)
@ -933,11 +932,11 @@ func (s *Subject32Ex) Print(file *os.File, delimiter string, flags int) {
var rgroup string var rgroup string
var ip string var ip string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(s.Auid) auser = strconv.Itoa(int(s.Auid))
euser = string(s.Euid) euser = strconv.Itoa(int(s.Euid))
egroup = string(s.Egid) egroup = strconv.Itoa(int(s.Egid))
ruser = string(s.Ruid) ruser = strconv.Itoa(int(s.Ruid))
rgroup = string(s.Rgid) rgroup = strconv.Itoa(int(s.Rgid))
} else { } else {
auser, _ = getUserName(s.Auid) auser, _ = getUserName(s.Auid)
euser, _ = getUserName(s.Euid) euser, _ = getUserName(s.Euid)
@ -1026,11 +1025,11 @@ func (p *Process32Ex) Print(file *os.File, delimiter string, flags int) {
var rgroup string var rgroup string
var ip string var ip string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(p.Auid) auser = strconv.Itoa(int(p.Auid))
euser = string(p.Euid) euser = strconv.Itoa(int(p.Euid))
egroup = string(p.Egid) egroup = strconv.Itoa(int(p.Egid))
ruser = string(p.Ruid) ruser = strconv.Itoa(int(p.Ruid))
rgroup = string(p.Rgid) rgroup = strconv.Itoa(int(p.Rgid))
} else { } else {
auser, _ = getUserName(p.Auid) auser, _ = getUserName(p.Auid)
euser, _ = getUserName(p.Euid) euser, _ = getUserName(p.Euid)
@ -1105,11 +1104,11 @@ func (s *Subject64) Print(file *os.File, delimiter string, flags int) {
var ruser string var ruser string
var rgroup string var rgroup string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(s.Auid) auser = strconv.Itoa(int(s.Auid))
euser = string(s.Euid) euser = strconv.Itoa(int(s.Euid))
egroup = string(s.Egid) egroup = strconv.Itoa(int(s.Egid))
ruser = string(s.Ruid) ruser = strconv.Itoa(int(s.Ruid))
rgroup = string(s.Rgid) rgroup = strconv.Itoa(int(s.Rgid))
} else { } else {
auser, _ = getUserName(s.Auid) auser, _ = getUserName(s.Auid)
euser, _ = getUserName(s.Euid) euser, _ = getUserName(s.Euid)
@ -1176,11 +1175,11 @@ func (p *Process64) Print(file *os.File, delimiter string, flags int) {
var ruser string var ruser string
var rgroup string var rgroup string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(p.Auid) auser = strconv.Itoa(int(p.Auid))
euser = string(p.Euid) euser = strconv.Itoa(int(p.Euid))
egroup = string(p.Egid) egroup = strconv.Itoa(int(p.Egid))
ruser = string(p.Ruid) ruser = strconv.Itoa(int(p.Ruid))
rgroup = string(p.Rgid) rgroup = strconv.Itoa(int(p.Rgid))
} else { } else {
auser, _ = getUserName(p.Auid) auser, _ = getUserName(p.Auid)
euser, _ = getUserName(p.Euid) euser, _ = getUserName(p.Euid)
@ -1262,11 +1261,11 @@ func (s *Subject64Ex) Print(file *os.File, delimiter string, flags int) {
var rgroup string var rgroup string
var ip string var ip string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(s.Auid) auser = strconv.Itoa(int(s.Auid))
euser = string(s.Euid) euser = strconv.Itoa(int(s.Euid))
egroup = string(s.Egid) egroup = strconv.Itoa(int(s.Egid))
ruser = string(s.Ruid) ruser = strconv.Itoa(int(s.Ruid))
rgroup = string(s.Rgid) rgroup = strconv.Itoa(int(s.Rgid))
} else { } else {
auser, _ = getUserName(s.Auid) auser, _ = getUserName(s.Auid)
euser, _ = getUserName(s.Euid) euser, _ = getUserName(s.Euid)
@ -1355,11 +1354,11 @@ func (p *Process64Ex) Print(file *os.File, delimiter string, flags int) {
var rgroup string var rgroup string
var ip string var ip string
if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER { if PRT_NORESOLVE_USER == flags & PRT_NORESOLVE_USER {
auser = string(p.Auid) auser = strconv.Itoa(int(p.Auid))
euser = string(p.Euid) euser = strconv.Itoa(int(p.Euid))
egroup = string(p.Egid) egroup = strconv.Itoa(int(p.Egid))
ruser = string(p.Ruid) ruser = strconv.Itoa(int(p.Ruid))
rgroup = string(p.Rgid) rgroup = strconv.Itoa(int(p.Rgid))
} else { } else {
auser, _ = getUserName(p.Auid) auser, _ = getUserName(p.Auid)
euser, _ = getUserName(p.Euid) euser, _ = getUserName(p.Euid)

View File

@ -31,7 +31,7 @@ import (
) )
const ( const (
version = "0.5" version = "0.5.1"
) )
var ( var (