diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2003-01-30 09:47:17 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2003-01-30 09:47:17 +0000 |
| commit | c828d3d9eb5badfd0e69a389aa8c8a5ee84065ba (patch) | |
| tree | 0f08117c06f8c247d40ccab12cd6b4e45ec955ee /libexec | |
| parent | 2d0750884372fc6fbb28b53701025bc6eb3f1d85 (diff) | |
revoke privs a bit later so spamd can bind() to ports < 1024
inspired by Nick Stott <nick at electric-pickle.net>
ok theo daniel
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/spamd/spamd.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libexec/spamd/spamd.c b/libexec/spamd/spamd.c index 27d25e6914a..0a555d797aa 100644 --- a/libexec/spamd/spamd.c +++ b/libexec/spamd/spamd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spamd.c,v 1.8 2003/01/24 23:39:28 deraadt Exp $ */ +/* $OpenBSD: spamd.c,v 1.9 2003/01/30 09:47:16 henning Exp $ */ /* * Copyright (c) 2002 Theo de Raadt. All rights reserved. @@ -327,23 +327,6 @@ main(int argc, char *argv[]) tzset(); openlog_r("spamd", LOG_PID | LOG_NDELAY, LOG_DAEMON, &sdata); - pw = getpwnam("_spamd"); - if (!pw) - pw = getpwnam("nobody"); - - if (chroot("/var/empty") == -1 || chdir("/") == -1) { - syslog(LOG_ERR, "cannot chdir to /var/empty."); - exit(1); - } - - if (pw) { - setgroups(1, &pw->pw_gid); - setegid(pw->pw_gid); - setgid(pw->pw_gid); - seteuid(pw->pw_uid); - setuid(pw->pw_uid); - } - if (gethostname(hostname, sizeof hostname) == -1) err(1, "gethostname"); @@ -405,6 +388,23 @@ main(int argc, char *argv[]) if (bind(s, (struct sockaddr *)&sin, sizeof sin) == -1) err(1, "bind"); + pw = getpwnam("_spamd"); + if (!pw) + pw = getpwnam("nobody"); + + if (chroot("/var/empty") == -1 || chdir("/") == -1) { + syslog(LOG_ERR, "cannot chdir to /var/empty."); + exit(1); + } + + if (pw) { + setgroups(1, &pw->pw_gid); + setegid(pw->pw_gid); + setgid(pw->pw_gid); + seteuid(pw->pw_uid); + setuid(pw->pw_uid); + } + if (listen(s, 10) == -1) err(1, "listen"); |