summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2009-12-02 19:10:03 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2009-12-02 19:10:03 +0000
commit4f72616162a613ffb175d8c08aa007e371d7e8c0 (patch)
treec291ce5fe4b72e78529d031c6f294f75529fcbeb /usr.sbin
parent72e4920f02d4e58ec9af1cfaf59cc7286ec84fb5 (diff)
log_warn() consistency.
`OK' claudio
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/control.c8
-rw-r--r--usr.sbin/dvmrpd/control.c4
-rw-r--r--usr.sbin/ldpd/control.c4
-rw-r--r--usr.sbin/ospf6d/control.c4
-rw-r--r--usr.sbin/ospfd/control.c4
-rw-r--r--usr.sbin/relayd/control.c4
-rw-r--r--usr.sbin/ripd/control.c4
-rw-r--r--usr.sbin/smtpd/control.c4
-rw-r--r--usr.sbin/snmpd/control.c4
9 files changed, 20 insertions, 20 deletions
diff --git a/usr.sbin/bgpd/control.c b/usr.sbin/bgpd/control.c
index 84d29d95765..3ae589677bb 100644
--- a/usr.sbin/bgpd/control.c
+++ b/usr.sbin/bgpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.64 2009/12/01 14:28:05 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.65 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -53,7 +53,7 @@ control_init(int restricted, char *path)
if (unlink(path) == -1)
if (errno != ENOENT) {
- log_warn("unlink %s", path);
+ log_warn("control_init: unlink %s", path);
close(fd);
return (-1);
}
@@ -123,14 +123,14 @@ control_accept(int listenfd, int restricted)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("session_control_accept");
+ log_warn("control_accept: accept");
return (0);
}
session_socket_blockmode(connfd, BM_NONBLOCK);
if ((ctl_conn = malloc(sizeof(struct ctl_conn))) == NULL) {
- log_warn("session_control_accept");
+ log_warn("control_accept");
close(connfd);
return (0);
}
diff --git a/usr.sbin/dvmrpd/control.c b/usr.sbin/dvmrpd/control.c
index 27c04a7040a..9be1261f18b 100644
--- a/usr.sbin/dvmrpd/control.c
+++ b/usr.sbin/dvmrpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.9 2009/11/02 20:31:50 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.10 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -121,7 +121,7 @@ control_accept(int listenfd, short event, void *bula)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/ldpd/control.c b/usr.sbin/ldpd/control.c
index 66dfe0d2224..e753f33433b 100644
--- a/usr.sbin/ldpd/control.c
+++ b/usr.sbin/ldpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.3 2009/11/02 20:34:58 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.4 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -120,7 +120,7 @@ control_accept(int listenfd, short event, void *bula)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/ospf6d/control.c b/usr.sbin/ospf6d/control.c
index ad372a6822b..c163830c4bc 100644
--- a/usr.sbin/ospf6d/control.c
+++ b/usr.sbin/ospf6d/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.11 2009/11/02 20:24:58 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.12 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -119,7 +119,7 @@ control_accept(int listenfd, short event, void *bula)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/ospfd/control.c b/usr.sbin/ospfd/control.c
index 9f57bb03611..39034bec1f5 100644
--- a/usr.sbin/ospfd/control.c
+++ b/usr.sbin/ospfd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.28 2009/11/02 20:20:54 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.29 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -121,7 +121,7 @@ control_accept(int listenfd, short event, void *bula)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c
index 899135ecf0d..66ee4bfc5ce 100644
--- a/usr.sbin/relayd/control.c
+++ b/usr.sbin/relayd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.32 2009/06/05 23:39:51 pyr Exp $ */
+/* $OpenBSD: control.c,v 1.33 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -136,7 +136,7 @@ control_accept(int listenfd, short event, void *arg)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/ripd/control.c b/usr.sbin/ripd/control.c
index 27751ace744..e15a449c5ff 100644
--- a/usr.sbin/ripd/control.c
+++ b/usr.sbin/ripd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.11 2009/11/02 20:28:48 claudio Exp $ */
+/* $OpenBSD: control.c,v 1.12 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -120,7 +120,7 @@ control_accept(int listenfd, short event, void *bula)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/smtpd/control.c b/usr.sbin/smtpd/control.c
index fddbe48b7c0..cb6cc775450 100644
--- a/usr.sbin/smtpd/control.c
+++ b/usr.sbin/smtpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.41 2009/11/26 22:21:20 chl Exp $ */
+/* $OpenBSD: control.c,v 1.42 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -220,7 +220,7 @@ control_accept(int listenfd, short event, void *arg)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}
diff --git a/usr.sbin/snmpd/control.c b/usr.sbin/snmpd/control.c
index bff03ef00d2..5072c4a1796 100644
--- a/usr.sbin/snmpd/control.c
+++ b/usr.sbin/snmpd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.11 2009/11/26 17:32:47 reyk Exp $ */
+/* $OpenBSD: control.c,v 1.12 2009/12/02 19:10:02 mk Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -142,7 +142,7 @@ control_accept(int listenfd, short event, void *arg)
if ((connfd = accept(listenfd,
(struct sockaddr *)&sun, &len)) == -1) {
if (errno != EWOULDBLOCK && errno != EINTR)
- log_warn("control_accept");
+ log_warn("control_accept: accept");
return;
}