diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-14 19:19:10 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-12-14 19:19:10 +0000 |
| commit | 9991174886f839baa9b6c598641c80d48e59aee6 (patch) | |
| tree | 39a2355c0180d0b3d93e71ed6813176f8c144745 /usr.sbin/inetd | |
| parent | dc2786cd15659abe86ac4fc732a49242908f5b9d (diff) | |
be more careful with setgroups()
Diffstat (limited to 'usr.sbin/inetd')
| -rw-r--r-- | usr.sbin/inetd/inetd.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 00860056b9c..9f8f105aa59 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: inetd.c,v 1.22 1996/12/11 09:05:05 deraadt Exp $ */ +/* $OpenBSD: inetd.c,v 1.23 1996/12/14 19:19:09 deraadt Exp $ */ /* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */ /* * Copyright (c) 1983,1991 The Regents of the University of California. @@ -41,7 +41,7 @@ char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/ -static char rcsid[] = "$OpenBSD: inetd.c,v 1.22 1996/12/11 09:05:05 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: inetd.c,v 1.23 1996/12/14 19:19:09 deraadt Exp $"; #endif /* not lint */ /* @@ -319,6 +319,14 @@ main(argc, argv, envp) if (uid == 0) (void) setlogin(""); } + + if (uid == 0) { + gid_t gid = getgid(); + + /* If run by hand, ensure groups vector gets trashed */ + setgroups(1, &gid); + } + openlog(progname, LOG_PID | LOG_NOWAIT, LOG_DAEMON); logpid(); @@ -494,7 +502,8 @@ main(argc, argv, envp) initgroups(pwd->pw_name, pwd->pw_gid); (void) setuid((uid_t)pwd->pw_uid); } else if (sep->se_group) { - (void) setgid((gid_t)grp->gr_gid); + (void) setgid(grp->gr_gid); + (void) setgroups(1, &grp->gr_gid); } if (debug) fprintf(stderr, "%d execl %s\n", |