From eff05270986a13e7de93ae16311f654d3f7c166f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Dec 2013 15:53:04 +0100 Subject: util: unify SO_PEERCRED/SO_PEERSEC invocations Introduce new call getpeercred() which internally just uses SO_PEERCRED but checks if the returned data is actually useful due to namespace quirks. --- src/login/pam-module.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/login') diff --git a/src/login/pam-module.c b/src/login/pam-module.c index 45428a090f..89623aa765 100644 --- a/src/login/pam-module.c +++ b/src/login/pam-module.c @@ -120,7 +120,6 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_ _cleanup_free_ char *p = NULL, *tty = NULL; _cleanup_close_ int fd = -1; struct ucred ucred; - socklen_t l; int v, r; assert(display); @@ -144,10 +143,9 @@ static int get_seat_from_display(const char *display, const char **seat, uint32_ if (connect(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)) < 0) return -errno; - l = sizeof(ucred); - r = getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &ucred, &l); + r = getpeercred(fd, &ucred); if (r < 0) - return -errno; + return r; r = get_ctty(ucred.pid, NULL, &tty); if (r < 0) -- cgit v1.2.3-54-g00ecf