RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 13:48:12 +00:00
Code Issues Activity Actions

usermod: Port to LibMain

Browse source
This commit is contained in:
faxe1008 2021-11-23 17:19:26 +01:00 • committed by Andreas Kling
parent b49bed5152
commit 02a7cfaad6
2 changed files with 10 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Userland/Utilities/CMakeLists.txt
View file

@ -107,6 +107,7 @@ target_link_libraries(truncate LibMain)
target_link_libraries(tt LibPthread) target_link_libraries(tt LibPthread)
target_link_libraries(unzip LibArchive LibCompress) target_link_libraries(unzip LibArchive LibCompress)
target_link_libraries(userdel LibMain) target_link_libraries(userdel LibMain)
target_link_libraries(usermod LibMain)
target_link_libraries(utmpupdate LibMain) target_link_libraries(utmpupdate LibMain)
target_link_libraries(zip LibArchive LibCompress LibCrypto) target_link_libraries(zip LibArchive LibCompress LibCrypto)
target_link_libraries(cpp-lexer LibCpp) target_link_libraries(cpp-lexer LibCpp)

34
Userland/Utilities/usermod.cpp
View file

@ -7,12 +7,14 @@
#include <LibCore/Account.h> #include <LibCore/Account.h>
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/System.h>
#include <LibMain/Main.h>
#include <pwd.h> #include <pwd.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
int main(int argc, char** argv) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {
if (geteuid() != 0) { if (geteuid() != 0) {
warnln("Not running as root :^("); warnln("Not running as root :^(");
@ -24,15 +26,8 @@ int main(int argc, char** argv)
return 1; return 1;
} }
if (pledge("stdio wpath rpath cpath fattr tty", nullptr) < 0) { TRY(Core::System::pledge("stdio wpath rpath cpath fattr tty", nullptr));
perror("pledge"); TRY(Core::System::unveil("/etc", "rwc"));
return 1;
}
if (unveil("/etc", "rwc") < 0) {
perror("unveil");
return 1;
}
int uid = 0; int uid = 0;
int gid = 0; int gid = 0;
@ -56,7 +51,7 @@ int main(int argc, char** argv)
args_parser.add_option(gecos, "Change the GECOS field of the user", "gecos", 'n', "general-info"); args_parser.add_option(gecos, "Change the GECOS field of the user", "gecos", 'n', "general-info");
args_parser.add_positional_argument(username, "Username of the account to modify", "username"); args_parser.add_positional_argument(username, "Username of the account to modify", "username");
args_parser.parse(argc, argv); args_parser.parse(arguments);
auto account_or_error = Core::Account::from_name(username); auto account_or_error = Core::Account::from_name(username);
@ -69,15 +64,8 @@ int main(int argc, char** argv)
auto& target_account = account_or_error.value(); auto& target_account = account_or_error.value();
if (move_home) { if (move_home) {
if (unveil(target_account.home_directory().characters(), "c") < 0) { TRY(Core::System::unveil(target_account.home_directory().characters(), "c"));
perror("unveil"); TRY(Core::System::unveil(new_home_directory, "wc"));
return 1;
}
if (unveil(new_home_directory, "wc") < 0) {
perror("unveil");
return 1;
}
} }
unveil(nullptr, nullptr); unveil(nullptr, nullptr);
@ -148,11 +136,7 @@ int main(int argc, char** argv)
target_account.set_gecos(gecos); target_account.set_gecos(gecos);
} }
if (pledge("stdio wpath rpath cpath fattr", nullptr) < 0) { TRY(Core::System::pledge("stdio wpath rpath cpath fattr", nullptr));
perror("pledge");
return 1;
}
if (!target_account.sync()) { if (!target_account.sync()) {
perror("Core::Account::Sync"); perror("Core::Account::Sync");
return 1; return 1;