X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fchange_identity.c;h=63c5ae1c8996d59d05a14629806abd8d60c23dfe;hb=ddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0;hp=c2b73eeb8bc56621e61331bf4f65094a9fbb3546;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/libbb/change_identity.c b/libbb/change_identity.c
index c2b73eeb8..63c5ae1c8 100644
--- a/libbb/change_identity.c
+++ b/libbb/change_identity.c
@@ -40,15 +40,21 @@
 
 
 /* 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);
+}