Page MenuHomeFreeBSD
Files F144121676

D41375.id125728.diff
No OneTemporary
Actions

D41375.id125728.diff
View Options

diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -3048,89 +3048,20 @@
return (q);
}
-/*
- * Crack a configuration file line
- */
static void
-cfline(const char *line, const char *prog, const char *host,
- const char *pfilter)
+parse_action(const char *p, struct filed *f)
{
- struct filed *f;
struct addrinfo hints, *res;
int error, i;
- const char *p, *q;
- char *pfilter_dup;
+ const char *q;
bool syncfile;
- dprintf("cfline(\"%s\", f, \"%s\", \"%s\", \"%s\")\n", line, prog,
- host, pfilter);
-
- f = calloc(1, sizeof(*f));
- if (f == NULL) {
- logerror("malloc");
- exit(1);
- }
- errno = 0; /* keep strerror() stuff out of logerror messages */
-
- for (i = 0; i <= LOG_NFACILITIES; i++)
- f->f_pmask[i] = INTERNAL_NOPRI;
-
- /* save hostname if any */
- if (host && *host == '*')
- host = NULL;
- if (host) {
- int hl;
-
- f->f_host = strdup(host);
- if (f->f_host == NULL) {
- logerror("strdup");
- exit(1);
- }
- hl = strlen(f->f_host);
- if (hl > 0 && f->f_host[hl-1] == '.')
- f->f_host[--hl] = '\0';
- /* RFC 5424 prefers logging FQDNs. */
- if (RFC3164OutputFormat)
- trimdomain(f->f_host, hl);
- }
-
- /* save program name if any */
- if (prog && *prog == '*')
- prog = NULL;
- if (prog) {
- f->f_program = strdup(prog);
- if (f->f_program == NULL) {
- logerror("strdup");
- exit(1);
- }
- }
-
- if (pfilter) {
- pfilter_dup = strdup(pfilter);
- if (pfilter_dup == NULL) {
- logerror("strdup");
- exit(1);
- }
- f->f_prop_filter = prop_filter_compile(pfilter_dup);
- if (f->f_prop_filter == NULL) {
- logerror("filter compile error");
- exit(1);
- }
- }
-
- /* scan through the list of selectors */
- for (p = line; *p != '\0' && *p != '\t' && *p != ' ';)
- p = parse_selector(p, f);
-
- /* skip to action part */
- while (*p == '\t' || *p == ' ')
- p++;
-
if (*p == '-') {
syncfile = false;
p++;
- } else
+ } else {
syncfile = true;
+ }
switch (*p) {
case '@':
@@ -3213,8 +3144,8 @@
break;
default:
- for (i = 0; i < MAXUNAMES && *p; i++) {
- for (q = p; *q && *q != ','; )
+ for (i = 0; i < MAXUNAMES && *p != '\0'; i++) {
+ for (q = p; *q != '\0' && *q != ','; )
q++;
(void)strncpy(f->fu_uname[i], p, MAXLOGNAME - 1);
if ((q - p) >= MAXLOGNAME)
@@ -3228,9 +3159,87 @@
f->f_type = F_USERS;
break;
}
- STAILQ_INSERT_TAIL(&fhead, f, next);
}
+/*
+ * Crack a configuration file line
+ */
+static void
+cfline(const char *line, const char *prog, const char *host,
+ const char *pfilter)
+{
+ struct filed *f;
+ int i;
+ const char *p;
+ char *pfilter_dup;
+
+ dprintf("cfline(\"%s\", f, \"%s\", \"%s\", \"%s\")\n", line, prog,
+ host, pfilter);
+
+ f = calloc(1, sizeof(*f));
+ if (f == NULL) {
+ logerror("malloc");
+ exit(1);
+ }
+ errno = 0; /* keep strerror() stuff out of logerror messages */
+
+ for (i = 0; i <= LOG_NFACILITIES; i++)
+ f->f_pmask[i] = INTERNAL_NOPRI;
+
+ /* save hostname if any */
+ if (host && *host == '*')
+ host = NULL;
+ if (host) {
+ int hl;
+
+ f->f_host = strdup(host);
+ if (f->f_host == NULL) {
+ logerror("strdup");
+ exit(1);
+ }
+ hl = strlen(f->f_host);
+ if (hl > 0 && f->f_host[hl-1] == '.')
+ f->f_host[--hl] = '\0';
+ /* RFC 5424 prefers logging FQDNs. */
+ if (RFC3164OutputFormat)
+ trimdomain(f->f_host, hl);
+ }
+
+ /* save program name if any */
+ if (prog && *prog == '*')
+ prog = NULL;
+ if (prog) {
+ f->f_program = strdup(prog);
+ if (f->f_program == NULL) {
+ logerror("strdup");
+ exit(1);
+ }
+ }
+
+ if (pfilter) {
+ pfilter_dup = strdup(pfilter);
+ if (pfilter_dup == NULL) {
+ logerror("strdup");
+ exit(1);
+ }
+ f->f_prop_filter = prop_filter_compile(pfilter_dup);
+ if (f->f_prop_filter == NULL) {
+ logerror("filter compile error");
+ exit(1);
+ }
+ }
+
+ /* scan through the list of selectors */
+ for (p = line; *p != '\0' && *p != '\t' && *p != ' ';)
+ p = parse_selector(p, f);
+
+ /* skip to action part */
+ while (*p == '\t' || *p == ' ')
+ p++;
+ parse_action(p, f);
+
+ STAILQ_INSERT_TAIL(&fhead, f, next);
+}
/*
* Decode a symbolic name to a numeric value

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 6, 3:13 AM (4 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28446057
Default Alt Text
D41375.id125728.diff (4 KB)

Event Timeline