summaryrefslogtreecommitdiff
path: root/networking/inetd.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-03-20 15:12:58 +0000
committerDenis Vlasenko2008-03-20 15:12:58 +0000
commit9230582315a15dd7b95de9f03c48024858ec935d (patch)
tree5495a94e29baa12c71e33fa8d049131fe572f881 /networking/inetd.c
parentc52248e41ce50bd3fa684d19b2bce4320267dc44 (diff)
downloadbusybox-9230582315a15dd7b95de9f03c48024858ec935d.zip
busybox-9230582315a15dd7b95de9f03c48024858ec935d.tar.gz
inetd: use change_identity().
libbb: shrink our internal initgroups(). httpd: remove stray 'else' and 'index_page = "index.html"' function old new delta httpd_main 750 743 -7 inetd_main 2033 2011 -22 bb_internal_initgroups 251 228 -23 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 0/3 up/down: 0/-52) Total: -52 bytes
Diffstat (limited to 'networking/inetd.c')
-rw-r--r--networking/inetd.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/networking/inetd.c b/networking/inetd.c
index b931aa1..5cdfe0a 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -142,15 +142,15 @@
/* Here's the scoop concerning the user[:group] feature:
* 1) group is not specified:
* a) user = root: NO setuid() or setgid() is done
- * b) other: setgid(primary group as found in passwd)
- * initgroups(name, primary group)
+ * b) other: initgroups(name, primary group)
+ * setgid(primary group as found in passwd)
* setuid()
* 2) group is specified:
* a) user = root: setgid(specified group)
* NO initgroups()
* NO setuid()
- * b) other: setgid(specified group)
- * initgroups(name, specified group)
+ * b) other: initgroups(name, specified group)
+ * setgid(specified group)
* setuid()
*/
@@ -1383,9 +1383,8 @@ int inetd_main(int argc ATTRIBUTE_UNUSED, char **argv)
if (pwd->pw_uid) {
if (sep->se_group)
pwd->pw_gid = grp->gr_gid;
- xsetgid(pwd->pw_gid);
- initgroups(pwd->pw_name, pwd->pw_gid);
- xsetuid(pwd->pw_uid);
+ /* initgroups, setgid, setuid: */
+ change_identity(pwd);
} else if (sep->se_group) {
xsetgid(grp->gr_gid);
setgroups(1, &grp->gr_gid);