+/* SPDX-License-Identifier: LGPL-2.1+ */
/***
This file is part of systemd.
#include "copy.h"
#include "def.h"
#include "fd-util.h"
+#include "fs-util.h"
#include "fileio-label.h"
-#include "formats-util.h"
+#include "format-util.h"
#include "hashmap.h"
#include "path-util.h"
#include "selinux-util.h"
static int make_backup(const char *target, const char *x) {
_cleanup_close_ int src = -1;
_cleanup_fclose_ FILE *dst = NULL;
- char *backup, *temp;
+ _cleanup_free_ char *temp = NULL;
+ char *backup;
struct timespec ts[2];
struct stat st;
int r;
if (r < 0)
return r;
- r = copy_bytes(src, fileno(dst), (uint64_t) -1, true);
+ r = copy_bytes(src, fileno(dst), (uint64_t) -1, COPY_REFLINK);
if (r < 0)
goto fail;
if (futimens(fileno(dst), ts) < 0)
log_warning_errno(errno, "Failed to fix access and modification time of %s: %m", backup);
- if (rename(temp, backup) < 0)
+ r = fflush_sync_and_check(dst);
+ if (r < 0)
goto fail;
+ if (rename(temp, backup) < 0) {
+ r = -errno;
+ goto fail;
+ }
+
return 0;
fail:
return 0;
}
+#if ENABLE_GSHADOW
static int putsgent_with_members(const struct sgrp *sg, FILE *gshadow) {
char **a;
return 0;
}
+#endif
static int sync_rights(FILE *from, FILE *to) {
struct stat st;
return r;
}
-static int write_files(void) {
-
- _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, *gshadow = NULL;
- _cleanup_free_ char *passwd_tmp = NULL, *group_tmp = NULL, *shadow_tmp = NULL, *gshadow_tmp = NULL;
- const char *passwd_path = NULL, *group_path = NULL, *shadow_path = NULL, *gshadow_path = NULL;
- bool group_changed = false;
+static int write_temporary_passwd(const char *passwd_path, FILE **tmpfile, char **tmpfile_path) {
+ _cleanup_fclose_ FILE *original = NULL, *passwd = NULL;
+ _cleanup_(unlink_and_freep) char *passwd_tmp = NULL;
Iterator iterator;
Item *i;
int r;
- if (hashmap_size(todo_gids) > 0 || hashmap_size(members) > 0) {
- _cleanup_fclose_ FILE *original = NULL;
+ if (hashmap_size(todo_uids) == 0)
+ return 0;
+
+ r = fopen_temporary_label("/etc/passwd", passwd_path, &passwd, &passwd_tmp);
+ if (r < 0)
+ return r;
- /* First we update the actual group list file */
- group_path = prefix_roota(arg_root, "/etc/group");
- r = fopen_temporary_label("/etc/group", group_path, &group, &group_tmp);
+ original = fopen(passwd_path, "re");
+ if (original) {
+ struct passwd *pw;
+
+ r = sync_rights(original, passwd);
if (r < 0)
- goto finish;
+ return r;
- original = fopen(group_path, "re");
- if (original) {
- struct group *gr;
+ errno = 0;
+ while ((pw = fgetpwent(original))) {
- r = sync_rights(original, group);
- if (r < 0)
- goto finish;
+ i = hashmap_get(users, pw->pw_name);
+ if (i && i->todo_user) {
+ log_error("%s: User \"%s\" already exists.", passwd_path, pw->pw_name);
+ return -EEXIST;
+ }
+
+ if (hashmap_contains(todo_uids, UID_TO_PTR(pw->pw_uid))) {
+ log_error("%s: Detected collision for UID " UID_FMT ".", passwd_path, pw->pw_uid);
+ return -EEXIST;
+ }
errno = 0;
- while ((gr = fgetgrent(original))) {
- /* Safety checks against name and GID
- * collisions. Normally, this should
- * be unnecessary, but given that we
- * look at the entries anyway here,
- * let's make an extra verification
- * step that we don't generate
- * duplicate entries. */
-
- i = hashmap_get(groups, gr->gr_name);
- if (i && i->todo_group) {
- log_error("%s: Group \"%s\" already exists.", group_path, gr->gr_name);
- r = -EEXIST;
- goto finish;
- }
+ if (putpwent(pw, passwd) < 0)
+ return errno ? -errno : -EIO;
- if (hashmap_contains(todo_gids, GID_TO_PTR(gr->gr_gid))) {
- log_error("%s: Detected collision for GID " GID_FMT ".", group_path, gr->gr_gid);
- r = -EEXIST;
- goto finish;
- }
+ errno = 0;
+ }
+ if (!IN_SET(errno, 0, ENOENT))
+ return -errno;
- r = putgrent_with_members(gr, group);
- if (r < 0)
- goto finish;
- if (r > 0)
- group_changed = true;
+ } else {
+ if (errno != ENOENT)
+ return -errno;
+ if (fchmod(fileno(passwd), 0644) < 0)
+ return -errno;
+ }
- errno = 0;
- }
- if (!IN_SET(errno, 0, ENOENT)) {
- r = -errno;
- goto finish;
- }
+ HASHMAP_FOREACH(i, todo_uids, iterator) {
+ struct passwd n = {
+ .pw_name = i->name,
+ .pw_uid = i->uid,
+ .pw_gid = i->gid,
+ .pw_gecos = i->description,
- } else if (errno != ENOENT) {
- r = -errno;
- goto finish;
- } else if (fchmod(fileno(group), 0644) < 0) {
- r = -errno;
- goto finish;
- }
+ /* "x" means the password is stored in the shadow file */
+ .pw_passwd = (char*) "x",
- HASHMAP_FOREACH(i, todo_gids, iterator) {
- struct group n = {
- .gr_name = i->name,
- .gr_gid = i->gid,
- .gr_passwd = (char*) "x",
- };
+ /* We default to the root directory as home */
+ .pw_dir = i->home ? i->home : (char*) "/",
- r = putgrent_with_members(&n, group);
- if (r < 0)
- goto finish;
+ /* Initialize the shell to nologin, with one exception:
+ * for root we patch in something special */
+ .pw_shell = i->uid == 0 ? (char*) "/bin/sh" : (char*) "/sbin/nologin",
+ };
- group_changed = true;
- }
+ errno = 0;
+ if (putpwent(&n, passwd) != 0)
+ return errno ? -errno : -EIO;
+ }
- r = fflush_and_check(group);
- if (r < 0)
- goto finish;
+ r = fflush_and_check(passwd);
+ if (r < 0)
+ return r;
- if (original) {
- fclose(original);
- original = NULL;
- }
+ *tmpfile = passwd;
+ *tmpfile_path = passwd_tmp;
+ passwd = NULL;
+ passwd_tmp = NULL;
+ return 0;
+}
- /* OK, now also update the shadow file for the group list */
- gshadow_path = prefix_roota(arg_root, "/etc/gshadow");
- r = fopen_temporary_label("/etc/gshadow", gshadow_path, &gshadow, &gshadow_tmp);
- if (r < 0)
- goto finish;
+static int write_temporary_shadow(const char *shadow_path, FILE **tmpfile, char **tmpfile_path) {
+ _cleanup_fclose_ FILE *original = NULL, *shadow = NULL;
+ _cleanup_(unlink_and_freep) char *shadow_tmp = NULL;
+ Iterator iterator;
+ long lstchg;
+ Item *i;
+ int r;
- original = fopen(gshadow_path, "re");
- if (original) {
- struct sgrp *sg;
+ if (hashmap_size(todo_uids) == 0)
+ return 0;
- r = sync_rights(original, gshadow);
- if (r < 0)
- goto finish;
+ r = fopen_temporary_label("/etc/shadow", shadow_path, &shadow, &shadow_tmp);
+ if (r < 0)
+ return r;
- errno = 0;
- while ((sg = fgetsgent(original))) {
+ lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY);
- i = hashmap_get(groups, sg->sg_namp);
- if (i && i->todo_group) {
- log_error("%s: Group \"%s\" already exists.", gshadow_path, sg->sg_namp);
- r = -EEXIST;
- goto finish;
- }
+ original = fopen(shadow_path, "re");
+ if (original) {
+ struct spwd *sp;
- r = putsgent_with_members(sg, gshadow);
- if (r < 0)
- goto finish;
- if (r > 0)
- group_changed = true;
+ r = sync_rights(original, shadow);
+ if (r < 0)
+ return r;
- errno = 0;
- }
- if (!IN_SET(errno, 0, ENOENT)) {
- r = -errno;
- goto finish;
- }
+ errno = 0;
+ while ((sp = fgetspent(original))) {
- } else if (errno != ENOENT) {
- r = -errno;
- goto finish;
- } else if (fchmod(fileno(gshadow), 0000) < 0) {
- r = -errno;
- goto finish;
- }
+ i = hashmap_get(users, sp->sp_namp);
+ if (i && i->todo_user) {
+ /* we will update the existing entry */
+ sp->sp_lstchg = lstchg;
- HASHMAP_FOREACH(i, todo_gids, iterator) {
- struct sgrp n = {
- .sg_namp = i->name,
- .sg_passwd = (char*) "!!",
- };
+ /* only the /etc/shadow stage is left, so we can
+ * safely remove the item from the todo set */
+ i->todo_user = false;
+ hashmap_remove(todo_uids, UID_TO_PTR(i->uid));
+ }
- r = putsgent_with_members(&n, gshadow);
- if (r < 0)
- goto finish;
+ errno = 0;
+ if (putspent(sp, shadow) < 0)
+ return errno ? -errno : -EIO;
- group_changed = true;
+ errno = 0;
}
+ if (!IN_SET(errno, 0, ENOENT))
+ return -errno;
- r = fflush_and_check(gshadow);
- if (r < 0)
- goto finish;
+ } else {
+ if (errno != ENOENT)
+ return -errno;
+ if (fchmod(fileno(shadow), 0000) < 0)
+ return -errno;
}
- if (hashmap_size(todo_uids) > 0) {
- _cleanup_fclose_ FILE *original = NULL;
- long lstchg;
-
- /* First we update the user database itself */
- passwd_path = prefix_roota(arg_root, "/etc/passwd");
- r = fopen_temporary_label("/etc/passwd", passwd_path, &passwd, &passwd_tmp);
- if (r < 0)
- goto finish;
+ HASHMAP_FOREACH(i, todo_uids, iterator) {
+ struct spwd n = {
+ .sp_namp = i->name,
+ .sp_pwdp = (char*) "!!",
+ .sp_lstchg = lstchg,
+ .sp_min = -1,
+ .sp_max = -1,
+ .sp_warn = -1,
+ .sp_inact = -1,
+ .sp_expire = -1,
+ .sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
+ };
- original = fopen(passwd_path, "re");
- if (original) {
- struct passwd *pw;
+ errno = 0;
+ if (putspent(&n, shadow) != 0)
+ return errno ? -errno : -EIO;
+ }
- r = sync_rights(original, passwd);
- if (r < 0)
- goto finish;
+ r = fflush_sync_and_check(shadow);
+ if (r < 0)
+ return r;
- errno = 0;
- while ((pw = fgetpwent(original))) {
+ *tmpfile = shadow;
+ *tmpfile_path = shadow_tmp;
+ shadow = NULL;
+ shadow_tmp = NULL;
+ return 0;
+}
- i = hashmap_get(users, pw->pw_name);
- if (i && i->todo_user) {
- log_error("%s: User \"%s\" already exists.", passwd_path, pw->pw_name);
- r = -EEXIST;
- goto finish;
- }
+static int write_temporary_group(const char *group_path, FILE **tmpfile, char **tmpfile_path) {
+ _cleanup_fclose_ FILE *original = NULL, *group = NULL;
+ _cleanup_(unlink_and_freep) char *group_tmp = NULL;
+ bool group_changed = false;
+ Iterator iterator;
+ Item *i;
+ int r;
- if (hashmap_contains(todo_uids, UID_TO_PTR(pw->pw_uid))) {
- log_error("%s: Detected collision for UID " UID_FMT ".", passwd_path, pw->pw_uid);
- r = -EEXIST;
- goto finish;
- }
+ if (hashmap_size(todo_gids) == 0 && hashmap_size(members) == 0)
+ return 0;
- errno = 0;
- if (putpwent(pw, passwd) < 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ r = fopen_temporary_label("/etc/group", group_path, &group, &group_tmp);
+ if (r < 0)
+ return r;
- errno = 0;
- }
- if (!IN_SET(errno, 0, ENOENT)) {
- r = -errno;
- goto finish;
- }
+ original = fopen(group_path, "re");
+ if (original) {
+ struct group *gr;
- } else if (errno != ENOENT) {
- r = -errno;
- goto finish;
- } else if (fchmod(fileno(passwd), 0644) < 0) {
- r = -errno;
- goto finish;
- }
-
- HASHMAP_FOREACH(i, todo_uids, iterator) {
- struct passwd n = {
- .pw_name = i->name,
- .pw_uid = i->uid,
- .pw_gid = i->gid,
- .pw_gecos = i->description,
+ r = sync_rights(original, group);
+ if (r < 0)
+ return r;
- /* "x" means the password is stored in
- * the shadow file */
- .pw_passwd = (char*) "x",
+ errno = 0;
+ while ((gr = fgetgrent(original))) {
+ /* Safety checks against name and GID collisions. Normally,
+ * this should be unnecessary, but given that we look at the
+ * entries anyway here, let's make an extra verification
+ * step that we don't generate duplicate entries. */
+
+ i = hashmap_get(groups, gr->gr_name);
+ if (i && i->todo_group) {
+ log_error("%s: Group \"%s\" already exists.", group_path, gr->gr_name);
+ return -EEXIST;
+ }
- /* We default to the root directory as home */
- .pw_dir = i->home ? i->home : (char*) "/",
+ if (hashmap_contains(todo_gids, GID_TO_PTR(gr->gr_gid))) {
+ log_error("%s: Detected collision for GID " GID_FMT ".", group_path, gr->gr_gid);
+ return -EEXIST;
+ }
- /* Initialize the shell to nologin,
- * with one exception: for root we
- * patch in something special */
- .pw_shell = i->uid == 0 ? (char*) "/bin/sh" : (char*) "/sbin/nologin",
- };
+ r = putgrent_with_members(gr, group);
+ if (r < 0)
+ return r;
+ if (r > 0)
+ group_changed = true;
errno = 0;
- if (putpwent(&n, passwd) != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
}
+ if (!IN_SET(errno, 0, ENOENT))
+ return -errno;
- r = fflush_and_check(passwd);
- if (r < 0)
- goto finish;
+ } else {
+ if (errno != ENOENT)
+ return -errno;
+ if (fchmod(fileno(group), 0644) < 0)
+ return -errno;
+ }
- if (original) {
- fclose(original);
- original = NULL;
- }
+ HASHMAP_FOREACH(i, todo_gids, iterator) {
+ struct group n = {
+ .gr_name = i->name,
+ .gr_gid = i->gid,
+ .gr_passwd = (char*) "x",
+ };
- /* The we update the shadow database */
- shadow_path = prefix_roota(arg_root, "/etc/shadow");
- r = fopen_temporary_label("/etc/shadow", shadow_path, &shadow, &shadow_tmp);
+ r = putgrent_with_members(&n, group);
if (r < 0)
- goto finish;
+ return r;
- lstchg = (long) (now(CLOCK_REALTIME) / USEC_PER_DAY);
+ group_changed = true;
+ }
- original = fopen(shadow_path, "re");
- if (original) {
- struct spwd *sp;
+ r = fflush_sync_and_check(group);
+ if (r < 0)
+ return r;
- r = sync_rights(original, shadow);
- if (r < 0)
- goto finish;
+ if (group_changed) {
+ *tmpfile = group;
+ *tmpfile_path = group_tmp;
+ group = NULL;
+ group_tmp = NULL;
+ }
+ return 0;
+}
- errno = 0;
- while ((sp = fgetspent(original))) {
+static int write_temporary_gshadow(const char * gshadow_path, FILE **tmpfile, char **tmpfile_path) {
+#if ENABLE_GSHADOW
+ _cleanup_fclose_ FILE *original = NULL, *gshadow = NULL;
+ _cleanup_(unlink_and_freep) char *gshadow_tmp = NULL;
+ bool group_changed = false;
+ Iterator iterator;
+ Item *i;
+ int r;
- i = hashmap_get(users, sp->sp_namp);
- if (i && i->todo_user) {
- /* we will update the existing entry */
- sp->sp_lstchg = lstchg;
+ if (hashmap_size(todo_gids) == 0 && hashmap_size(members) == 0)
+ return 0;
- /* only the /etc/shadow stage is left, so we can
- * safely remove the item from the todo set */
- i->todo_user = false;
- hashmap_remove(todo_uids, UID_TO_PTR(i->uid));
- }
+ r = fopen_temporary_label("/etc/gshadow", gshadow_path, &gshadow, &gshadow_tmp);
+ if (r < 0)
+ return r;
- errno = 0;
- if (putspent(sp, shadow) < 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ original = fopen(gshadow_path, "re");
+ if (original) {
+ struct sgrp *sg;
- errno = 0;
- }
- if (!IN_SET(errno, 0, ENOENT)) {
- r = -errno;
- goto finish;
+ r = sync_rights(original, gshadow);
+ if (r < 0)
+ return r;
+
+ errno = 0;
+ while ((sg = fgetsgent(original))) {
+
+ i = hashmap_get(groups, sg->sg_namp);
+ if (i && i->todo_group) {
+ log_error("%s: Group \"%s\" already exists.", gshadow_path, sg->sg_namp);
+ return -EEXIST;
}
- } else if (errno != ENOENT) {
- r = -errno;
- goto finish;
- } else if (fchmod(fileno(shadow), 0000) < 0) {
- r = -errno;
- goto finish;
- }
- HASHMAP_FOREACH(i, todo_uids, iterator) {
- struct spwd n = {
- .sp_namp = i->name,
- .sp_pwdp = (char*) "!!",
- .sp_lstchg = lstchg,
- .sp_min = -1,
- .sp_max = -1,
- .sp_warn = -1,
- .sp_inact = -1,
- .sp_expire = -1,
- .sp_flag = (unsigned long) -1, /* this appears to be what everybody does ... */
- };
+ r = putsgent_with_members(sg, gshadow);
+ if (r < 0)
+ return r;
+ if (r > 0)
+ group_changed = true;
errno = 0;
- if (putspent(&n, shadow) != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
}
+ if (!IN_SET(errno, 0, ENOENT))
+ return -errno;
- r = fflush_and_check(shadow);
+ } else {
+ if (errno != ENOENT)
+ return -errno;
+ if (fchmod(fileno(gshadow), 0000) < 0)
+ return -errno;
+ }
+
+ HASHMAP_FOREACH(i, todo_gids, iterator) {
+ struct sgrp n = {
+ .sg_namp = i->name,
+ .sg_passwd = (char*) "!!",
+ };
+
+ r = putsgent_with_members(&n, gshadow);
if (r < 0)
- goto finish;
+ return r;
+
+ group_changed = true;
}
- /* Make a backup of the old files */
+ r = fflush_sync_and_check(gshadow);
+ if (r < 0)
+ return r;
+
if (group_changed) {
- if (group) {
- r = make_backup("/etc/group", group_path);
- if (r < 0)
- goto finish;
- }
- if (gshadow) {
- r = make_backup("/etc/gshadow", gshadow_path);
- if (r < 0)
- goto finish;
- }
+ *tmpfile = gshadow;
+ *tmpfile_path = gshadow_tmp;
+ gshadow = NULL;
+ gshadow_tmp = NULL;
+ }
+ return 0;
+#else
+ return 0;
+#endif
+}
+
+static int write_files(void) {
+ _cleanup_fclose_ FILE *passwd = NULL, *group = NULL, *shadow = NULL, *gshadow = NULL;
+ _cleanup_(unlink_and_freep) char *passwd_tmp = NULL, *group_tmp = NULL, *shadow_tmp = NULL, *gshadow_tmp = NULL;
+ const char *passwd_path = NULL, *group_path = NULL, *shadow_path = NULL, *gshadow_path = NULL;
+ int r;
+
+ passwd_path = prefix_roota(arg_root, "/etc/passwd");
+ shadow_path = prefix_roota(arg_root, "/etc/shadow");
+ group_path = prefix_roota(arg_root, "/etc/group");
+ gshadow_path = prefix_roota(arg_root, "/etc/gshadow");
+
+ r = write_temporary_group(group_path, &group, &group_tmp);
+ if (r < 0)
+ return r;
+
+ r = write_temporary_gshadow(gshadow_path, &gshadow, &gshadow_tmp);
+ if (r < 0)
+ return r;
+
+ r = write_temporary_passwd(passwd_path, &passwd, &passwd_tmp);
+ if (r < 0)
+ return r;
+
+ r = write_temporary_shadow(shadow_path, &shadow, &shadow_tmp);
+ if (r < 0)
+ return r;
+
+ /* Make a backup of the old files */
+ if (group) {
+ r = make_backup("/etc/group", group_path);
+ if (r < 0)
+ return r;
+ }
+ if (gshadow) {
+ r = make_backup("/etc/gshadow", gshadow_path);
+ if (r < 0)
+ return r;
}
if (passwd) {
r = make_backup("/etc/passwd", passwd_path);
if (r < 0)
- goto finish;
+ return r;
}
if (shadow) {
r = make_backup("/etc/shadow", shadow_path);
if (r < 0)
- goto finish;
+ return r;
}
/* And make the new files count */
- if (group_changed) {
- if (group) {
- r = rename_and_apply_smack(group_tmp, group_path);
- if (r < 0)
- goto finish;
+ if (group) {
+ r = rename_and_apply_smack(group_tmp, group_path);
+ if (r < 0)
+ return r;
- group_tmp = mfree(group_tmp);
- }
- if (gshadow) {
- r = rename_and_apply_smack(gshadow_tmp, gshadow_path);
- if (r < 0)
- goto finish;
+ group_tmp = mfree(group_tmp);
+ }
+ if (gshadow) {
+ r = rename_and_apply_smack(gshadow_tmp, gshadow_path);
+ if (r < 0)
+ return r;
- gshadow_tmp = mfree(gshadow_tmp);
- }
+ gshadow_tmp = mfree(gshadow_tmp);
}
if (passwd) {
r = rename_and_apply_smack(passwd_tmp, passwd_path);
if (r < 0)
- goto finish;
+ return r;
passwd_tmp = mfree(passwd_tmp);
}
if (shadow) {
r = rename_and_apply_smack(shadow_tmp, shadow_path);
if (r < 0)
- goto finish;
+ return r;
shadow_tmp = mfree(shadow_tmp);
}
- r = 0;
-
-finish:
- if (passwd_tmp)
- unlink(passwd_tmp);
- if (shadow_tmp)
- unlink(shadow_tmp);
- if (group_tmp)
- unlink(group_tmp);
- if (gshadow_tmp)
- unlink(gshadow_tmp);
-
- return r;
+ return 0;
}
static int uid_is_ok(uid_t uid, const char *name) {
free(i->uid_path);
free(i->gid_path);
free(i->description);
+ free(i->home);
free(i);
}
return true;
}
-static bool valid_user_group_name(const char *u) {
- const char *i;
- long sz;
-
- if (isempty(u))
- return false;
-
- if (!(u[0] >= 'a' && u[0] <= 'z') &&
- !(u[0] >= 'A' && u[0] <= 'Z') &&
- u[0] != '_')
- return false;
-
- for (i = u+1; *i; i++) {
- if (!(*i >= 'a' && *i <= 'z') &&
- !(*i >= 'A' && *i <= 'Z') &&
- !(*i >= '0' && *i <= '9') &&
- *i != '_' &&
- *i != '-')
- return false;
- }
-
- sz = sysconf(_SC_LOGIN_NAME_MAX);
- assert_se(sz > 0);
-
- if ((size_t) (i-u) > (size_t) sz)
- return false;
-
- if ((size_t) (i-u) > UT_NAMESIZE - 1)
- return false;
-
- return true;
-}
-
-static bool valid_gecos(const char *d) {
-
- if (!d)
- return false;
-
- if (!utf8_is_valid(d))
- return false;
-
- if (string_has_cc(d, NULL))
- return false;
-
- /* Colons are used as field separators, and hence not OK */
- if (strchr(d, ':'))
- return false;
-
- return true;
-}
-
-static bool valid_home(const char *p) {
-
- if (isempty(p))
- return false;
-
- if (!utf8_is_valid(p))
- return false;
-
- if (string_has_cc(p, NULL))
- return false;
-
- if (!path_is_absolute(p))
- return false;
-
- if (!path_is_safe(p))
- return false;
-
- /* Colons are used as field separators, and hence not OK */
- if (strchr(p, ':'))
- return false;
-
- return true;
-}
-
static int parse_line(const char *fname, unsigned line, const char *buffer) {
static const Specifier specifier_table[] = {
}
if (!IN_SET(action[0], ADD_USER, ADD_GROUP, ADD_MEMBER, ADD_RANGE)) {
- log_error("[%s:%u] Unknown command command type '%c'.", fname, line, action[0]);
+ log_error("[%s:%u] Unknown command type '%c'.", fname, line, action[0]);
return -EBADMSG;
}
v++;
l = strstrip(line);
- if (*l == '#' || *l == 0)
+ if (IN_SET(*l, 0, '#'))
continue;
k = parse_line(fn, v, l);
_cleanup_strv_free_ char **files = NULL;
char **f;
- r = conf_files_list_nulstr(&files, ".conf", arg_root, conf_file_dirs);
+ r = conf_files_list_nulstr(&files, ".conf", arg_root, 0, conf_file_dirs);
if (r < 0) {
log_error_errno(r, "Failed to enumerate sysusers.d files: %m");
goto finish;
}
}
+ /* Let's tell nss-systemd not to synthesize the "root" and "nobody" entries for it, so that our detection
+ * whether the names or UID/GID area already used otherwise doesn't get confused. After all, even though
+ * nss-systemd synthesizes these users/groups, they should still appear in /etc/passwd and /etc/group, as the
+ * synthesizing logic is merely supposed to be fallback for cases where we run with a completely unpopulated
+ * /etc. */
+ if (setenv("SYSTEMD_NSS_BYPASS_SYNTHETIC", "1", 1) < 0) {
+ r = log_error_errno(errno, "Failed to set SYSTEMD_NSS_BYPASS_SYNTHETIC environment variable: %m");
+ goto finish;
+ }
+
if (!uid_range) {
/* Default to default range of 1..SYSTEMD_UID_MAX */
r = uid_range_add(&uid_range, &n_uid_range, 1, SYSTEM_UID_MAX);
projects / thirdparty / systemd.git / blobdiff