Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Use _PATH_VARRUN. 

- Address PR 10577 from mjl: recognise '.' as user/group seperator.
This commit is contained in:
ad 2000-07-13 11:28:50 +00:00
parent 7101b4c03f
commit 5bf219a1a3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/newsyslog/newsyslog.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newsyslog.c,v 1.30 2000/07/11 12:06:32 ad Exp $ */
/* $NetBSD: newsyslog.c,v 1.31 2000/07/13 11:28:50 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -55,7 +55,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: newsyslog.c,v 1.30 2000/07/11 12:06:32 ad Exp $");
__RCSID("$NetBSD: newsyslog.c,v 1.31 2000/07/13 11:28:50 ad Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -77,6 +77,7 @@ __RCSID("$NetBSD: newsyslog.c,v 1.30 2000/07/11 12:06:32 ad Exp $");
#include <errno.h>
#include <err.h>
#include <util.h>
#include <paths.h>
#include "pathnames.h"
@ -223,7 +224,7 @@ parse(struct conf_entry *log, FILE *fd, size_t *_lineno)
ap = argv;
strlcpy(log->logfile, *ap++, sizeof(log->logfile));
if (strchr(*ap, ':') != NULL) {
if (strchr(*ap, ':') != NULL || strchr(*ap, '.') != NULL) {
if (parseuserspec(*ap++, &pw, &gr)) {
warnx("config line %d: unknown user/group", lineno);
return (-1);

4
usr.bin/newsyslog/pathnames.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pathnames.h,v 1.1 2000/07/07 10:52:41 ad Exp $ */
/* $NetBSD: pathnames.h,v 1.2 2000/07/13 11:28:51 ad Exp $ */
/*
* Copyright (c) 1999, 2000 Andrew Doran <ad@NetBSD.org>
@ -28,5 +28,5 @@
*/
#define _PATH_NEWSYSLOGCONF "/etc/newsyslog.conf"
#define _PATH_SYSLOGDPID "/var/run/syslogd.pid"
#define _PATH_SYSLOGDPID _PATH_VARRUN"syslogd.pid"
#define _PATH_GZIP "/usr/bin/gzip"