Skip to content

Commit

Permalink
Update to handle removal of security_context_t from libselinux
Browse files Browse the repository at this point in the history
  • Loading branch information
pmorie committed May 28, 2014
1 parent 3c781d0 commit cd1475c
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions selinux/library/selinux_impl.go
Expand Up @@ -36,7 +36,7 @@ var (
)

func Matchpathcon(path string, mode os.FileMode) (string, error) {
var con C.security_context_t
var con *C.char
var scon string
rc, err := C.matchpathcon(C.CString(path), C.mode_t(mode), &con)
if rc == 0 {
Expand All @@ -52,7 +52,7 @@ func Setfilecon(path, scon string) (int, error) {
}

func Getfilecon(path string) (string, error) {
var scon C.security_context_t
var scon *C.char
var fcon string
rc, err := C.lgetfilecon(C.CString(path), &scon)
if rc >= 0 {
Expand All @@ -76,7 +76,7 @@ func Setfscreatecon(scon string) (int, error) {
}

func Getfscreatecon() (string, error) {
var scon C.security_context_t
var scon *C.char
var fcon string
rc, err := C.getfscreatecon(&scon)
if rc >= 0 {
Expand All @@ -88,15 +88,15 @@ func Getfscreatecon() (string, error) {
}

func Getcon() string {
var pcon C.security_context_t
var pcon *C.char
C.getcon(&pcon)
scon := C.GoString(pcon)
C.freecon(pcon)
return scon
}

func Getpidcon(pid int) (string, error) {
var pcon C.security_context_t
var pcon *C.char
var scon string
rc, err := C.getpidcon(C.pid_t(pid), &pcon)
if rc >= 0 {
Expand All @@ -108,7 +108,7 @@ func Getpidcon(pid int) (string, error) {
}

func Getpeercon(socket int) (string, error) {
var pcon C.security_context_t
var pcon *C.char
var scon string
rc, err := C.getpeercon(C.int(socket), &pcon)
if rc >= 0 {
Expand Down

0 comments on commit cd1475c

Please sign in to comment.