X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fchange_identity.c;h=619db09a85e211e2c543e72d08cbdd3d66cbe431;hb=08ea11ab0749a7977e6d47cd0fa7b3c9cc10af32;hp=adebad8ed280bd9f6cfb141c3cdfbdaf4067f816;hpb=99bd5adf995ee0f83bdda92384137ae810c4c92b;p=oweals%2Fbusybox.git

diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index adebad8ed..619db09a8 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -28,35 +28,14 @@
  * SUCH DAMAGE.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <syslog.h>
-#include <ctype.h>
-
 #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 ( );
-
-	if ( setgid ( pw-> pw_gid ))
-		return "cannot set group id";
-	if ( setuid ( pw->pw_uid ))
-		return "cannot set user id";
-	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 );
+	if (initgroups(pw->pw_name, pw->pw_gid) == -1)
+		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);
 }