X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fchange_identity.c;h=619db09a85e211e2c543e72d08cbdd3d66cbe431;hb=ac4100e103ca2b4e6e782c5814b1f43cef58c00b;hp=b2274e0aebbcc53bd071a371f95c3637fd00d469;hpb=0c97c9d43707da745fe2bc62ab2a69497ceaf666;p=oweals%2Fbusybox.git

diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index b2274e0ae..619db09a8 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -30,22 +30,12 @@
 
 #include "libbb.h"
 
-
 /* Become the user and group(s) specified by PW.  */
-const char *change_identity_e2str(const struct passwd *pw)
+void FAST_FUNC change_identity(const struct passwd *pw)
 {
 	if (initgroups(pw->pw_name, pw->pw_gid) == -1)
-		return "cannot set groups";
-	endgrent(); /* ?? */
+		bb_perror_msg_and_die("can't set groups");
+	endgrent(); /* helps to close a fd used internally by libc */
 	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_simple_perror_msg_and_die(err_msg);
 }