d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When specifying the -t option (send tag in front of message), this tag

Browse Source 
should also be forwarded to the remote logging host, not only when the
logging is done locally.

PR:		bin/154324
Submitted by:	Callum Gibson <callumgibson@optusnet.com.au>
MFC after:	1 week
This commit is contained in:
edwin 2011-04-08 12:33:07 +00:00
parent ee4349ecf2
commit a01908291f
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
usr.bin/logger/logger.1
View File

@ -102,7 +102,8 @@ facility.
The default is ``user.notice.''
.It Fl t Ar tag
Mark every line in the log with the specified
.Ar tag .
.Ar tag
rather than the default of current login name.
.It Ar message
Write the message to log; if not specified, and the
.Fl f

21
usr.bin/logger/logger.c
View File

@ -59,7 +59,8 @@ __FBSDID("$FreeBSD$");
int decode(char *, CODE *);
int pencode(char *);
static void logmessage(int, const char *, const char *, const char *);
static void logmessage(int, const char *, const char *, const char *,
const char *);
static void usage(void);
struct socks {
@ -137,8 +138,11 @@ main(int argc, char *argv[])
argc -= optind;
argv += optind;
if (tag == NULL)
tag = getlogin();
/* setup for logging */
openlog(tag ? tag : getlogin(), logflags, 0);
if (host == NULL)
openlog(tag, logflags, 0);
(void) fclose(stdout);
/* log input line if appropriate */
@ -149,11 +153,11 @@ main(int argc, char *argv[])
for (p = buf, endp = buf + sizeof(buf) - 2; *argv;) {
len = strlen(*argv);
if (p + len > endp && p > buf) {
logmessage(pri, host, svcname, buf);
logmessage(pri, tag, host, svcname, buf);
p = buf;
}
if (len > sizeof(buf) - 1)
logmessage(pri, host, svcname, *argv++);
logmessage(pri, tag, host, svcname, *argv++);
else {
if (p != buf)
*p++ = ' ';
@ -162,10 +166,10 @@ main(int argc, char *argv[])
}
}
if (p != buf)
logmessage(pri, host, svcname, buf);
logmessage(pri, tag, host, svcname, buf);
} else
while (fgets(buf, sizeof(buf), stdin) != NULL)
logmessage(pri, host, svcname, buf);
logmessage(pri, tag, host, svcname, buf);
exit(0);
}
@ -173,7 +177,8 @@ main(int argc, char *argv[])
* Send the message to syslog, either on the local host, or on a remote host
*/
void
logmessage(int pri, const char *host, const char *svcname, const char *buf)
logmessage(int pri, const char *tag, const char *host, const char *svcname,
const char *buf)
{
static struct socks *socks;
static int nsock = 0;
@ -217,7 +222,7 @@ logmessage(int pri, const char *host, const char *svcname, const char *buf)
errx(1, "socket");
}
if ((len = asprintf(&line, "<%d>%s", pri, buf)) == -1)
if ((len = asprintf(&line, "<%d>%s: %s", pri, tag, buf)) == -1)
errx(1, "asprintf");
lsent = -1;