summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbeck <beck@openbsd.org>2014-11-10 14:16:22 +0000
committerbeck <beck@openbsd.org>2014-11-10 14:16:22 +0000
commit57bc6ec9e037f6cd2f93ed9c12c3a9db7f6b20f0 (patch)
treeaef693c7cf4d32a1b8b261a108853ff97d56743c
parentApparently xhci(4) also needs a hook to set the address of a device. (diff)
downloadwireguard-openbsd-57bc6ec9e037f6cd2f93ed9c12c3a9db7f6b20f0.tar.xz
wireguard-openbsd-57bc6ec9e037f6cd2f93ed9c12c3a9db7f6b20f0.zip
Don't attempt to open log files when using syslog, as we are not going to
use them. ok reyk@
-rw-r--r--usr.sbin/httpd/logger.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/usr.sbin/httpd/logger.c b/usr.sbin/httpd/logger.c
index 665db759852..8e7784dbb19 100644
--- a/usr.sbin/httpd/logger.c
+++ b/usr.sbin/httpd/logger.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: logger.c,v 1.5 2014/08/06 12:56:58 reyk Exp $ */
+/* $OpenBSD: logger.c,v 1.6 2014/11/10 14:16:22 beck Exp $ */
/*
* Copyright (c) 2014 Reyk Floeter <reyk@openbsd.org>
@@ -194,6 +194,9 @@ logger_open(struct server *srv, struct server_config *srv_conf, void *arg)
{
struct log_file *log, *logfile = NULL, *errfile = NULL;
+ if (srv_conf->flags & SRVFLAG_SYSLOG)
+ return(0);
+
/* disassociate */
srv_conf->logaccess = srv_conf->logerror = NULL;