diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-22 18:25:32 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2002-07-22 18:25:32 +0000 |
| commit | 6db939b5c93903943f3006ed8d88340c1710ad4d (patch) | |
| tree | 2514773a41eabc912f591354d3bb3fb6fd8382fe | |
| parent | df784e636737d462b8b0a03af49be75a3d95a521 (diff) | |
don't attempt to chroot if we are already chrooted ;-)
(happens on SIGHUP aka apachectl restart)
| -rw-r--r-- | usr.sbin/httpd/src/main/http_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/main/http_main.c b/usr.sbin/httpd/src/main/http_main.c index 08f549bc495..49e6e90b563 100644 --- a/usr.sbin/httpd/src/main/http_main.c +++ b/usr.sbin/httpd/src/main/http_main.c @@ -1,4 +1,4 @@ -/* $OpenBSD: http_main.c,v 1.19 2002/07/20 10:38:25 henning Exp $ */ +/* $OpenBSD: http_main.c,v 1.20 2002/07/22 18:25:31 henning Exp $ */ /* ==================================================================== * The Apache Software License, Version 1.1 @@ -5189,7 +5189,7 @@ static void standalone_main(int argc, char **argv) ap_init_modules(pconf, server_conf); version_locked++; /* no more changes to server_version */ - if(!is_graceful) + if(!is_graceful && !is_chrooted) if (ap_server_chroot) { if (geteuid()) { ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_EMERG, |