Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/libbb/change_identity.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/libbb/change_identity.c (modified) (1 diff)

branches/2.2.5/mindi-busybox/libbb/change_identity.c

@@ -29 +29 @@
  */
 
-#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 )
+const char *change_identity_e2str(const struct passwd *pw)
 {
-    if ( initgroups ( pw-> pw_name, pw-> pw_gid ) == -1 )
+    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";
+    endgrent(); /* ?? */
+    xsetgid(pw->pw_gid);
+    xsetuid(pw->pw_uid);
     return NULL;
 }
 
-void change_identity ( const struct passwd *pw )
+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 (err_msg)
+        bb_perror_msg_and_die("%s", err_msg);
 }