From 8745098fa440ef3bf1d8e173dcd91514b34600c6 Mon Sep 17 00:00:00 2001 From: sin Date: Wed, 9 Jul 2014 14:40:49 +0100 Subject: [PATCH] Only check errno if getpwuid() fails Checking errno otherwise is unspecified. --- slock.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/slock.c b/slock.c index aedee2e..399386b 100644 --- a/slock.c +++ b/slock.c @@ -67,10 +67,12 @@ getpw(void) { /* only run as root */ errno = 0; pw = getpwuid(getuid()); - if (errno) - die("slock: getpwuid: %s\n", strerror(errno)); - else if (!pw) - die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n"); + if (!pw) { + if (errno) + die("slock: getpwuid: %s\n", strerror(errno)); + else + die("slock: cannot retrieve password entry (make sure to suid or sgid slock)\n"); + } endpwent(); rval = pw->pw_passwd; -- 2.39.2