projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename functions to more understandable names
[oweals/busybox.git]
/
libbb
/
change_identity.c
diff --git
a/libbb/change_identity.c
b/libbb/change_identity.c
index c2b73eeb8bc56621e61331bf4f65094a9fbb3546..63c5ae1c8996d59d05a14629806abd8d60c23dfe 100644
(file)
--- a/
libbb/change_identity.c
+++ b/
libbb/change_identity.c
@@
-40,15
+40,21
@@
/* Become the user and group(s) specified by PW. */
/* Become the user and group(s) specified by PW. */
-
void change_identity ( const struct passwd *pw
)
+
const char *change_identity_e2str(const struct passwd *pw
)
{
{
- if (
initgroups ( pw-> pw_name, pw-> pw_gid ) == -1
)
-
bb_perror_msg_and_die ( "cannot set groups" )
;
- endgrent
(
);
+ if (
initgroups(pw->pw_name, pw->pw_gid) == -1
)
+
return "cannot set groups"
;
+ endgrent
(
);
- if ( setgid ( pw-> pw_gid ))
- bb_perror_msg_and_die ( "cannot set group id" );
- if ( setuid ( pw->pw_uid ))
- bb_perror_msg_and_die ( "cannot set user id" );
+ xsetgid(pw->pw_gid);
+ xsetuid(pw->pw_uid);
+ return NULL;
}
}
+void change_identity(const struct passwd *pw)
+{
+ const char *err_msg = change_identity_e2str(pw);
+
+ if(err_msg)
+ bb_perror_msg_and_die("%s", err_msg);
+}