From c8ba46c9f9afb482052e018a0ed5c1c67b896c57 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Aug 2015 23:58:22 -0600 Subject: wip --- src/nslcd_systemd/nslcd_systemd.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/nslcd_systemd') diff --git a/src/nslcd_systemd/nslcd_systemd.go b/src/nslcd_systemd/nslcd_systemd.go index 80e23b2..9868581 100644 --- a/src/nslcd_systemd/nslcd_systemd.go +++ b/src/nslcd_systemd/nslcd_systemd.go @@ -34,14 +34,14 @@ func get_socket() (socket net.Listener, err error) { return } -func getpeercred(conn *net.UnixConn) (cred *syscall.Ucred, err error) { - cred = nil +func getpeercred(conn *net.UnixConn) (cred nslcd_proto.Ucred, err error) { file, err := conn.File() if err != nil { return } defer file.Close() - cred, err = syscall.GetsockoptUcred(int(file.Fd()), syscall.SOL_SOCKET, syscall.SO_PEERCRED) + _cred, err := syscall.GetsockoptUcred(int(file.Fd()), syscall.SOL_SOCKET, syscall.SO_PEERCRED) + cred = nslcd_proto.Ucred{*_cred} return } @@ -54,7 +54,7 @@ func handler(conn *net.UnixConn, backend nslcd_proto.Backend) { logger.Debug("connection from pid=%v uid=%v gid=%v", cred.Pid, cred.Uid, cred.Gid) } - err = nslcd_proto.HandleRequest(backend, conn, conn, *cred) + err = nslcd_proto.HandleRequest(backend, conn, conn, cred) if err != nil { logger.Debug("Error while handling request: %v", err) } @@ -89,10 +89,10 @@ func Main(backend Backend) { sock <- conn.(*net.UnixConn) } }() - + var wg sync.WaitGroup sd.Notify(false, "READY=1") -Loop: +Loop: for { select { case sig := <-sigs: -- cgit v1.2.3-54-g00ecf