diff options
| author |   henning <henning@openbsd.org> | 2002-07-22 18:52:08 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2002-07-22 18:52:08 +0000 |
| commit | 1a4dfa6d6ca35a40f085e0bebfe3feddb423c1b3 (patch) | |
| tree | 1844f95a1f8f240a7e6e890ce86cdb487338f5c6 /usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c | |
| parent | don't attempt to chroot if we are already chrooted ;-) (diff) | |
| download | wireguard-openbsd-1a4dfa6d6ca35a40f085e0bebfe3feddb423c1b3.tar.xz wireguard-openbsd-1a4dfa6d6ca35a40f085e0bebfe3feddb423c1b3.zip | |
don't try to recheck the pathes to server.crt and .key once chrooted
makes graceful restarts work when running SSL.
Diffstat (limited to 'usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c')
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c index c47340b2232..5fd4d6be7b9 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_config.c @@ -562,7 +562,7 @@ const char *ssl_cmd_SSLCertificateFile( int i; cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg); - if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath)) + if (!ap_server_is_chrooted() && !ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath)) return ap_pstrcat(cmd->pool, "SSLCertificateFile: file '", cpPath, "' not exists or empty", NULL); for (i = 0; i < SSL_AIDX_MAX && sc->szPublicCertFile[i] != NULL; i++) @@ -583,7 +583,7 @@ const char *ssl_cmd_SSLCertificateKeyFile( int i; cpPath = ssl_util_server_root_relative(cmd->pool, "certkey", arg); - if (!ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath)) + if (!ap_server_is_chrooted() && !ssl_util_path_check(SSL_PCM_EXISTS|SSL_PCM_ISREG|SSL_PCM_ISNONZERO, cpPath)) return ap_pstrcat(cmd->pool, "SSLCertificateKeyFile: file '", cpPath, "' not exists or empty", NULL); for (i = 0; i < SSL_AIDX_MAX && sc->szPrivateKeyFile[i] != NULL; i++) |