Prep v239: Add missing updates that evaded migration.

[elogind.git] / src / basic / user-util.c

diff --git a/src/basic/user-util.c b/src/basic/user-util.c
index f7b2a7c9d9e8d663ca07d7a389ca023d26baaafc..7bc5ba7e098c1d76a98067a86419faa7e17f0086 100644 (file)
--- a/src/basic/user-util.c
+++ b/src/basic/user-util.c
@@ -1,22 +1,4 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
-/***
-  This file is part of systemd.
-
-  Copyright 2010 Lennart Poettering
-
-  systemd is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  systemd is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http://www.gnu.org/licenses/>.
-***/
 
 #include <alloca.h>
 #include <errno.h>
@@ -237,8 +219,7 @@ int get_user_creds_clean(
             (isempty(*shell) || is_nologin_shell(*shell)))
                 *shell = NULL;
 
-        if (home &&
-            (isempty(*home) || path_equal(*home, "/")))
+        if (home && empty_or_root(*home))
                 *home = NULL;
 
         return 0;
@@ -743,6 +724,7 @@ bool synthesize_nobody(void) {
 #endif
 }
 
+#if 0 /// UNNEEDED by elogind
 int putpwent_sane(const struct passwd *pw, FILE *stream) {
         assert(pw);
         assert(stream);
@@ -797,14 +779,11 @@ int fgetpwent_sane(FILE *stream, struct passwd **pw) {
 
         errno = 0;
         p = fgetpwent(stream);
-        if (p == NULL) {
-                if (errno == ENOENT)
-                        return false;
+        if (!p && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
-        }
 
         *pw = p;
-        return true;
+        return !!p;
 }
 
 int fgetspent_sane(FILE *stream, struct spwd **sp) {
@@ -815,14 +794,11 @@ int fgetspent_sane(FILE *stream, struct spwd **sp) {
 
         errno = 0;
         s = fgetspent(stream);
-        if (s == NULL) {
-                if (errno == ENOENT)
-                        return false;
+        if (!s && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
-        }
 
         *sp = s;
-        return true;
+        return !!s;
 }
 
 int fgetgrent_sane(FILE *stream, struct group **gr) {
@@ -833,14 +809,11 @@ int fgetgrent_sane(FILE *stream, struct group **gr) {
 
         errno = 0;
         g = fgetgrent(stream);
-        if (g == NULL) {
-                if (errno == ENOENT)
-                        return false;
+        if (!g && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
-        }
 
         *gr = g;
-        return true;
+        return !!g;
 }
 
 #if ENABLE_GSHADOW
@@ -852,13 +825,11 @@ int fgetsgent_sane(FILE *stream, struct sgrp **sg) {
 
         errno = 0;
         s = fgetsgent(stream);
-        if (s == NULL) {
-                if (errno == ENOENT)
-                        return false;
+        if (!s && errno != ENOENT)
                 return errno > 0 ? -errno : -EIO;
-        }
 
         *sg = s;
-        return true;
+        return !!s;
 }
 #endif
+#endif // 0