diff options
| author |   henning <henning@openbsd.org> | 2003-03-15 12:02:23 +0000 |
|---|---|---|
| committer | henning <henning@openbsd.org> | 2003-03-15 12:02:23 +0000 |
| commit | 2824a941fd4433e71bd765faab0f69ad76c7597b (patch) | |
| tree | c735346ea0a72db3914b59196bc98df27a214a7a | |
| parent | New frame addressing (plus (subreg (reg fp)) const) is supported by push_frame_in_operand. (diff) | |
| download | wireguard-openbsd-2824a941fd4433e71bd765faab0f69ad76c7597b.tar.xz wireguard-openbsd-2824a941fd4433e71bd765faab0f69ad76c7597b.zip | |
missing ap_server_strip_chroot()
| -rw-r--r-- | usr.sbin/httpd/src/modules/ssl/ssl_engine_mutex.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_engine_mutex.c b/usr.sbin/httpd/src/modules/ssl/ssl_engine_mutex.c index fdbfd48aaee..514cfecd731 100644 --- a/usr.sbin/httpd/src/modules/ssl/ssl_engine_mutex.c +++ b/usr.sbin/httpd/src/modules/ssl/ssl_engine_mutex.c @@ -143,14 +143,17 @@ void ssl_mutex_file_create(server_rec *s, pool *p) { #ifndef WIN32 SSLModConfigRec *mc = myModConfig(); + char mutexfile[MAXPATHLEN]; /* create the lockfile */ - unlink(mc->szMutexFile); - if ((mc->nMutexFD = ap_popenf(p, mc->szMutexFile, + strlcpy(mutexfile, mc->szMutexFile, sizeof(mutexfile)); + ap_server_strip_chroot(mutexfile, 0); + unlink(mutexfile); + if ((mc->nMutexFD = ap_popenf(p, mutexfile, O_WRONLY|O_CREAT, SSL_MUTEX_LOCK_MODE)) < 0) { ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO, "Parent process could not create SSLMutex lockfile %s", - mc->szMutexFile); + mutexfile); ssl_die(); } ap_pclosef(p, mc->nMutexFD); @@ -158,15 +161,15 @@ void ssl_mutex_file_create(server_rec *s, pool *p) /* make sure the childs have access to this file */ #ifndef OS2 if (geteuid() == 0 /* is superuser */) - chown(mc->szMutexFile, ap_user_id, -1 /* no gid change */); + chown(mutexfile, ap_user_id, -1 /* no gid change */); #endif /* open the lockfile for real */ - if ((mc->nMutexFD = ap_popenf(p, mc->szMutexFile, + if ((mc->nMutexFD = ap_popenf(p, mutexfile, O_WRONLY, SSL_MUTEX_LOCK_MODE)) < 0) { ssl_log(s, SSL_LOG_ERROR|SSL_ADD_ERRNO, "Parent could not open SSLMutex lockfile %s", - mc->szMutexFile); + mutexfile); ssl_die(); } #endif |