Page MenuHomeFreeBSD
Files F162637824

D57164.diff
No OneTemporary
Actions

D57164.diff
View Options

diff --git a/usr.sbin/autofs/common.h b/usr.sbin/autofs/common.h
--- a/usr.sbin/autofs/common.h
+++ b/usr.sbin/autofs/common.h
@@ -58,8 +58,6 @@
};
void log_init(int level);
-void log_set_peer_name(const char *name);
-void log_set_peer_addr(const char *addr);
void log_err(int, const char *, ...)
__dead2 __printf0like(2, 3);
void log_errx(int, const char *, ...)
diff --git a/usr.sbin/autofs/log.c b/usr.sbin/autofs/log.c
--- a/usr.sbin/autofs/log.c
+++ b/usr.sbin/autofs/log.c
@@ -41,8 +41,6 @@
#include "common.h"
static int log_level = 0;
-static char *peer_name = NULL;
-static char *peer_addr = NULL;
#define MSGBUF_LEN 1024
@@ -54,34 +52,6 @@
openlog(getprogname(), LOG_NDELAY | LOG_PID, LOG_DAEMON);
}
-void
-log_set_peer_name(const char *name)
-{
-
- /*
- * XXX: Turn it into assertion?
- */
- if (peer_name != NULL)
- log_errx(1, "%s called twice", __func__);
- if (peer_addr == NULL)
- log_errx(1, "%s called before log_set_peer_addr", __func__);
-
- peer_name = checked_strdup(name);
-}
-
-void
-log_set_peer_addr(const char *addr)
-{
-
- /*
- * XXX: Turn it into assertion?
- */
- if (peer_addr != NULL)
- log_errx(1, "%s called twice", __func__);
-
- peer_addr = checked_strdup(addr);
-}
-
static void
log_common(int priority, int log_errno, const char *fmt, va_list ap)
{
@@ -105,40 +75,14 @@
}
if (log_errno == -1) {
- if (peer_name != NULL) {
- fprintf(stderr, "%s: %s (%s): %s\n", getprogname(),
- peer_addr, peer_name, msgbuf_strvised);
- syslog(priority, "%s (%s): %s",
- peer_addr, peer_name, msgbuf_strvised);
- } else if (peer_addr != NULL) {
- fprintf(stderr, "%s: %s: %s\n", getprogname(),
- peer_addr, msgbuf_strvised);
- syslog(priority, "%s: %s",
- peer_addr, msgbuf_strvised);
- } else {
- fprintf(stderr, "%s: %s\n", getprogname(), msgbuf_strvised);
- syslog(priority, "%s", msgbuf_strvised);
- }
-
+ fprintf(stderr, "%s: %s\n", getprogname(), msgbuf_strvised);
+ syslog(priority, "%s", msgbuf_strvised);
} else {
errstr = strerror(log_errno);
- if (peer_name != NULL) {
- fprintf(stderr, "%s: %s (%s): %s: %s\n", getprogname(),
- peer_addr, peer_name, msgbuf_strvised, errstr);
- syslog(priority, "%s (%s): %s: %s",
- peer_addr, peer_name, msgbuf_strvised, errstr);
- } else if (peer_addr != NULL) {
- fprintf(stderr, "%s: %s: %s: %s\n", getprogname(),
- peer_addr, msgbuf_strvised, errstr);
- syslog(priority, "%s: %s: %s",
- peer_addr, msgbuf_strvised, errstr);
- } else {
- fprintf(stderr, "%s: %s: %s\n", getprogname(),
- msgbuf_strvised, errstr);
- syslog(priority, "%s: %s",
- msgbuf_strvised, errstr);
- }
+ fprintf(stderr, "%s: %s: %s\n",
+ getprogname(), msgbuf_strvised, errstr);
+ syslog(priority, "%s: %s", msgbuf_strvised, errstr);
}
}

File Metadata

Mime Type
text/plain
Expires
Thu, Jul 16, 7:23 AM (12 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35129240
Default Alt Text
D57164.diff (2 KB)

Event Timeline