summaryrefslogtreecommitdiffstats
path: root/configd
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-07-02 09:29:29 +0000
committerArne Juul <arnej@verizonmedia.com>2020-07-03 08:02:38 +0000
commitb8647a23221786bc7e04d24e64af1cd3e3dcdec5 (patch)
treeda0df813ae6e3cf0046a4d52e452446fff9a3ceb /configd
parentf3f83d945605bbf381def5b2342f9f33f9601b68 (diff)
use return from main() for clean shutdown
Diffstat (limited to 'configd')
-rw-r--r--configd/src/apps/su/main.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/configd/src/apps/su/main.cpp b/configd/src/apps/su/main.cpp
index abef5c69036..095bbdb6844 100644
--- a/configd/src/apps/su/main.cpp
+++ b/configd/src/apps/su/main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char** argv)
{
if (argc < 2) {
fprintf(stderr, "missing arguments, usage: vespa-run-as-vespa-user <cmd> [args ...]\n");
- exit(1);
+ return 1;
}
const char *username = getenv("VESPA_USER");
if (username == nullptr) {
@@ -23,7 +23,7 @@ int main(int argc, char** argv)
struct passwd *p = getpwnam(username);
if (p == nullptr) {
fprintf(stderr, "FATAL error: user '%s' missing in passwd file\n", username);
- exit(1);
+ return 1;
}
gid_t g = p->pw_gid;
uid_t u = p->pw_uid;
@@ -33,19 +33,19 @@ int main(int argc, char** argv)
if (g != oldg && setgid(g) != 0) {
perror("FATAL error: could not change group id");
- exit(1);
+ return 1;
}
size_t listsize = 1;
gid_t grouplist[1] = { g };
if ((g != oldg || u != oldu) && setgroups(listsize, grouplist) != 0) {
perror("FATAL error: could not setgroups");
- exit(1);
+ return 1;
}
if (u != oldu && setuid(u) != 0) {
perror("FATAL error: could not change user id");
- exit(1);
+ return 1;
}
execvp(argv[1], &argv[1]);
perror("FATAL error: execvp failed");
- exit(1);
+ return 1;
}