Skip to content

useradd: skip btrfs subvolume creation for system users #1619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
silverhadch wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −1
Open

useradd: skip btrfs subvolume creation for system users #1619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/useradd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2220,12 +2220,21 @@ static void create_home(const struct option_flags *flags)
char *bhome, *cp;
mode_t mode;
bool process_selinux;
#if WITH_BTRFS
uid_t uid_min;
uid_t uid_max;
#endif

process_selinux = !flags->chroot && !flags->prefix;

if (access (prefix_user_home, F_OK) == 0)
return;

#if WITH_BTRFS
uid_min = getdef_ulong("UID_MIN", 1000UL);
uid_max = getdef_ulong("UID_MAX", 60000UL);
#endif

strcpy(path, "");
bhome = strdup(prefix_user_home);
if (!bhome) {
Expand Down Expand Up @@ -2264,7 +2273,8 @@ static void create_home(const struct option_flags *flags)

dir_created = false;
#if WITH_BTRFS
if (subvolflg && (strlen(prefix_user_home) - (int)strlen(path)) <= 1) {
if (subvolflg && user_id >= uid_min && user_id <= uid_max
&& (strlen(prefix_user_home) - (int)strlen(path)) <= 1) {
char *btrfs_check = strdup(path);
struct statfs sfs;

Expand Down
Loading