mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-15 22:12:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

useradd: Don't crash on -m if directory already exists

Browse source
This commit is contained in:
ddorando 2024-02-03 04:44:22 +02:00 • committed by Andreas Kling
commit 7eec2d6c21
Notes: sideshowbarker 2024-07-17 09:41:18 +09:00
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Userland/Utilities/useradd.cpp
View file

@ -143,11 +143,15 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
home = home_path; home = home_path;
if (create_home_dir) { if (create_home_dir) {
bool existed = false;
auto mkdir_error = Core::System::mkdir(home, 0700); auto mkdir_error = Core::System::mkdir(home, 0700);
if (mkdir_error.is_error()) { if (mkdir_error.is_error()) {
int code = mkdir_error.release_error().code(); int code = mkdir_error.release_error().code();
warnln("Failed to create directory {}: {}", home, strerror(code)); warnln("Failed to create directory {}: {}", home, strerror(code));
return 12;
if (code != EEXIST)
return 12;
existed = true;
} }
auto chown_error = Core::System::chown(home, static_cast<uid_t>(uid), static_cast<gid_t>(gid)); auto chown_error = Core::System::chown(home, static_cast<uid_t>(uid), static_cast<gid_t>(gid));
@ -155,7 +159,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
int code = chown_error.release_error().code(); int code = chown_error.release_error().code();
warnln("Failed to change owner of {} to {}:{}: {}", home, uid, gid, strerror(code)); warnln("Failed to change owner of {} to {}:{}: {}", home, uid, gid, strerror(code));
if (rmdir(home.characters()) < 0) { if (!existed && rmdir(home.characters()) < 0) {
warnln("Failed to remove directory {}: {}", home, strerror(errno)); warnln("Failed to remove directory {}: {}", home, strerror(errno));
} }