From cd1475c12ab622115e27fefc2fd9481e24ae99c0 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Wed, 28 May 2014 16:38:19 -0400 Subject: [PATCH] Update to handle removal of security_context_t from libselinux --- selinux/library/selinux_impl.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/selinux/library/selinux_impl.go b/selinux/library/selinux_impl.go index 52381095..b8234fa1 100644 --- a/selinux/library/selinux_impl.go +++ b/selinux/library/selinux_impl.go @@ -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 { @@ -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 { @@ -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 { @@ -88,7 +88,7 @@ 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) @@ -96,7 +96,7 @@ func Getcon() string { } 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 { @@ -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 {